diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
index 19cee9d..bd5b489 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -25,10 +25,12 @@
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE 1=1
@@ -77,6 +79,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
 
@@ -86,12 +89,16 @@
 
     <select id="selectDetailById" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE bescra.id = #{id}
+        GROUP BY bescra.id
+        ORDER BY bescra.create_time DESC
     </select>
 </mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
index 19cee9d..bd5b489 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -25,10 +25,12 @@
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE 1=1
@@ -77,6 +79,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
 
@@ -86,12 +89,16 @@
 
     <select id="selectDetailById" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE bescra.id = #{id}
+        GROUP BY bescra.id
+        ORDER BY bescra.create_time DESC
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
index 4d09ad5..febaa4e 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
@@ -54,6 +54,18 @@
         <if test="request != null and request.createDept != null and request.createDept !=''">
             and create_dept like concat('%',#{request.createDept},'%')
         </if>
+        <if test="request != null and request.reviewType != null and request.reviewType !=''">
+            and review_type = #{request.reviewType}
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and software_version like concat('%',#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
+            and create_time &gt;= #{request.createTimeStart}
+        </if>
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
+            and create_time &lt;= #{request.createTimeEnd}
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
index 19cee9d..bd5b489 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -25,10 +25,12 @@
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE 1=1
@@ -77,6 +79,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
 
@@ -86,12 +89,16 @@
 
     <select id="selectDetailById" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE bescra.id = #{id}
+        GROUP BY bescra.id
+        ORDER BY bescra.create_time DESC
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
index 4d09ad5..febaa4e 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
@@ -54,6 +54,18 @@
         <if test="request != null and request.createDept != null and request.createDept !=''">
             and create_dept like concat('%',#{request.createDept},'%')
         </if>
+        <if test="request != null and request.reviewType != null and request.reviewType !=''">
+            and review_type = #{request.reviewType}
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and software_version like concat('%',#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
+            and create_time &gt;= #{request.createTimeStart}
+        </if>
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
+            and create_time &lt;= #{request.createTimeEnd}
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
index 41dff87..28d52c7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
@@ -22,4 +22,16 @@
 
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String createDept;
+
+    @ApiModelProperty(value = "新建/修订软件评审（1新建 2修订）", dataType = "Integer")
+    private Integer reviewType;
+
+    @ApiModelProperty(value = "版本号", dataType = "String")
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String createTimeEnd;
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
index 19cee9d..bd5b489 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -25,10 +25,12 @@
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE 1=1
@@ -77,6 +79,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
 
@@ -86,12 +89,16 @@
 
     <select id="selectDetailById" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE bescra.id = #{id}
+        GROUP BY bescra.id
+        ORDER BY bescra.create_time DESC
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
index 4d09ad5..febaa4e 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
@@ -54,6 +54,18 @@
         <if test="request != null and request.createDept != null and request.createDept !=''">
             and create_dept like concat('%',#{request.createDept},'%')
         </if>
+        <if test="request != null and request.reviewType != null and request.reviewType !=''">
+            and review_type = #{request.reviewType}
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and software_version like concat('%',#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
+            and create_time &gt;= #{request.createTimeStart}
+        </if>
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
+            and create_time &lt;= #{request.createTimeEnd}
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
index 41dff87..28d52c7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
@@ -22,4 +22,16 @@
 
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String createDept;
+
+    @ApiModelProperty(value = "新建/修订软件评审（1新建 2修订）", dataType = "Integer")
+    private Integer reviewType;
+
+    @ApiModelProperty(value = "版本号", dataType = "String")
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String createTimeEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
index a5d6456..d10e544 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
@@ -98,6 +98,10 @@
     @TableField("create_user_name")
     private String createUserName;
 
+    @ApiModelProperty(value = "核查员", dataType = "String")
+    @TableField(exist = false)
+    private String checkUserName;
+
     /**
      * 创建时间
      */

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
index bfccfed..1d5076c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -8,7 +8,7 @@
 public interface PrefixCodeEnum {
     /*************计量检定业务****************/
     //任务单编号
-    String ORDER_PREFIX = "rwd";
+    String ORDER_PREFIX = "jrwd"; //j代表计量业务系统
     //交接单编号
     String INTERCHANGE_PREFIX = "jjd";
     //标识打印
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
index 19cee9d..bd5b489 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -25,10 +25,12 @@
 
     <select id="selectBatchForApprovalList" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE 1=1
@@ -77,6 +79,7 @@
                 #{id}
             </foreach>
         </if>
+        GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
 
@@ -86,12 +89,16 @@
 
     <select id="selectDetailById" resultMap="BaseResultMap">
         SELECT bescra.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel,
-        bei.equipment_name AS checkEquipmentName, bei.model AS checkEquipmentModel, besci.create_user_name, besci.check_date
+        GROUP_CONCAT(bei.equipment_name SEPARATOR ',') AS checkEquipmentName, GROUP_CONCAT(bei.model SEPARATOR ',') AS checkEquipmentModel,
+        besci.create_user_name AS checkUserName, besci.check_date
         FROM biz_equipment_standard_check_record_approval bescra
         JOIN biz_equipment_standard_check_info besci ON bescra.data_id = besci.id
-        JOIN biz_equipment_info bei ON besci.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
+        JOIN biz_equipment_standard_check_info_equipment bescie ON bescie.data_id = besci.id
+        JOIN biz_equipment_info bei ON bescie.check_equipment_id = bei.id <!--核查标准设备id(作为标准的)-->
         JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id <!--被核查标准装置id-->
         JOIN biz_equipment_info beit ON besci.equipment_id = beit.id <!--被核查设备id-->
         WHERE bescra.id = #{id}
+        GROUP BY bescra.id
+        ORDER BY bescra.create_time DESC
     </select>
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
index 4d09ad5..febaa4e 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareReviewReportMapper.xml
@@ -54,6 +54,18 @@
         <if test="request != null and request.createDept != null and request.createDept !=''">
             and create_dept like concat('%',#{request.createDept},'%')
         </if>
+        <if test="request != null and request.reviewType != null and request.reviewType !=''">
+            and review_type = #{request.reviewType}
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and software_version like concat('%',#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createTimeStart != null and request.createTimeStart !=''">
+            and create_time &gt;= #{request.createTimeStart}
+        </if>
+        <if test="request != null and request.createTimeEnd != null and request.createTimeEnd !=''">
+            and create_time &lt;= #{request.createTimeEnd}
+        </if>
         <if test="businessKeys != null">
             and id in
             <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
index 41dff87..28d52c7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareReviewReportApprovalListRequest.java
@@ -22,4 +22,16 @@
 
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String createDept;
+
+    @ApiModelProperty(value = "新建/修订软件评审（1新建 2修订）", dataType = "Integer")
+    private Integer reviewType;
+
+    @ApiModelProperty(value = "版本号", dataType = "String")
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "申请时间开始", dataType = "String")
+    private String createTimeStart;
+
+    @ApiModelProperty(value = "申请时间结束", dataType = "String")
+    private String createTimeEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
index a5d6456..d10e544 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/BizEquipmentStandardCheckRecordApproval.java
@@ -98,6 +98,10 @@
     @TableField("create_user_name")
     private String createUserName;
 
+    @ApiModelProperty(value = "核查员", dataType = "String")
+    @TableField(exist = false)
+    private String checkUserName;
+
     /**
      * 创建时间
      */
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java
index 6cec2ee..5ee97eb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckInfoServiceImpl.java
@@ -266,9 +266,11 @@
         //有部分套标准装置的不同核查项分类对应的表头合成不到一张表中的话，还要增加超19个List（前端判断传哪个List）
         if (!CollectionUtils.isEmpty(checkInfo.getCheckDataCalibratorList())) {
             List<BizEquipmentStandardCheckDataCalibrator> checkDataCalibratorList = checkInfo.getCheckDataCalibratorList();
+            checkDataCalibratorList.forEach(checkData -> checkData.setDataId(checkInfo.getId()));
             if (checkDataCalibratorService.saveBatch(checkDataCalibratorList)) return true;
         } else if (!CollectionUtils.isEmpty(checkInfo.getCheckDataPistonGaugeList())) {
             List<BizEquipmentStandardCheckDataPistonGauge> checkDataPistonGaugeList = checkInfo.getCheckDataPistonGaugeList();
+            checkDataPistonGaugeList.forEach(checkData -> checkData.setDataId(checkInfo.getId()));
             if (checkDataPistonGaugeService.saveBatch(checkDataPistonGaugeList)) return true;
         }
         return false;