diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
index 076a2be..26b6733 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
@@ -28,7 +28,19 @@
         JOIN biz_resource_software_review_report brsrr ON brsi.report_id = brsrr.id
         WHERE 1=1
         <if test="request != null and request.softwareName != null and request.softwareName !=''">
-            and software_name = #{request.softwareName}
+            and brsrr.software_name like concat(#{request.softwareName},'%')
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and brsrr.software_version like concat(#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
+            and brsi.create_user_name like concat('%',#{request.createUserName},'%')
+        </if>
+        <if test="request != null and request.updateTimeStart != null and request.updateTimeStart !=''">
+            and brsi.update_time &gt;= #{request.updateTimeStart}
+        </if>
+        <if test="request != null and request.updateTimeEnd != null and request.updateTimeEnd !=''">
+            and brsi.update_time &lt;= #{request.updateTimeEnd}
         </if>
     </select>
 

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
index 076a2be..26b6733 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
@@ -28,7 +28,19 @@
         JOIN biz_resource_software_review_report brsrr ON brsi.report_id = brsrr.id
         WHERE 1=1
         <if test="request != null and request.softwareName != null and request.softwareName !=''">
-            and software_name = #{request.softwareName}
+            and brsrr.software_name like concat(#{request.softwareName},'%')
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and brsrr.software_version like concat(#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
+            and brsi.create_user_name like concat('%',#{request.createUserName},'%')
+        </if>
+        <if test="request != null and request.updateTimeStart != null and request.updateTimeStart !=''">
+            and brsi.update_time &gt;= #{request.updateTimeStart}
+        </if>
+        <if test="request != null and request.updateTimeEnd != null and request.updateTimeEnd !=''">
+            and brsi.update_time &lt;= #{request.updateTimeEnd}
         </if>
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
index f67a9cd..644ca6b 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
@@ -51,6 +51,15 @@
         <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.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/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
index 076a2be..26b6733 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
@@ -28,7 +28,19 @@
         JOIN biz_resource_software_review_report brsrr ON brsi.report_id = brsrr.id
         WHERE 1=1
         <if test="request != null and request.softwareName != null and request.softwareName !=''">
-            and software_name = #{request.softwareName}
+            and brsrr.software_name like concat(#{request.softwareName},'%')
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and brsrr.software_version like concat(#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
+            and brsi.create_user_name like concat('%',#{request.createUserName},'%')
+        </if>
+        <if test="request != null and request.updateTimeStart != null and request.updateTimeStart !=''">
+            and brsi.update_time &gt;= #{request.updateTimeStart}
+        </if>
+        <if test="request != null and request.updateTimeEnd != null and request.updateTimeEnd !=''">
+            and brsi.update_time &lt;= #{request.updateTimeEnd}
         </if>
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
index f67a9cd..644ca6b 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
@@ -51,6 +51,15 @@
         <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.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/SoftwareRevisionApplyApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
index 2543e5a..a4e5d63 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
@@ -22,4 +22,13 @@
 
     @ApiModelProperty(value = "申请部门", dataType = "String")
     private String createDept;
+
+    @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/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
index 076a2be..26b6733 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
@@ -28,7 +28,19 @@
         JOIN biz_resource_software_review_report brsrr ON brsi.report_id = brsrr.id
         WHERE 1=1
         <if test="request != null and request.softwareName != null and request.softwareName !=''">
-            and software_name = #{request.softwareName}
+            and brsrr.software_name like concat(#{request.softwareName},'%')
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and brsrr.software_version like concat(#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
+            and brsi.create_user_name like concat('%',#{request.createUserName},'%')
+        </if>
+        <if test="request != null and request.updateTimeStart != null and request.updateTimeStart !=''">
+            and brsi.update_time &gt;= #{request.updateTimeStart}
+        </if>
+        <if test="request != null and request.updateTimeEnd != null and request.updateTimeEnd !=''">
+            and brsi.update_time &lt;= #{request.updateTimeEnd}
         </if>
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
index f67a9cd..644ca6b 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
@@ -51,6 +51,15 @@
         <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.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/SoftwareRevisionApplyApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
index 2543e5a..a4e5d63 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
@@ -22,4 +22,13 @@
 
     @ApiModelProperty(value = "申请部门", dataType = "String")
     private String createDept;
+
+    @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/dto/resource/software/SoftwareInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
index 4fa6812..a1b1bd4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
@@ -12,4 +12,16 @@
 public class SoftwareInfoListRequest {
     @ApiModelProperty(value = "软件名", dataType = "String")
     private String softwareName;
+
+    @ApiModelProperty(value = "版本号", dataType = "String")
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUserName;
+
+    @ApiModelProperty(value = "更新时间开始", dataType = "String")
+    private String updateTimeStart;
+
+    @ApiModelProperty(value = "更新时间结束", dataType = "String")
+    private String updateTimeEnd;
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 9a947a3..c56671d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -75,5 +75,10 @@
      */
     String DEGREE_OF_DISTORTION = "14";
 
+    /**
+     * 多功能电气安全校准器标准装置
+     */
+    String ELECTRICAL_SAFETY = "15";
+
 
 }
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 bd5b489..9651a57 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardCheckRecordApprovalMapper.xml
@@ -67,18 +67,18 @@
         <if test="request != null and request.checkDateEnd != null and request.checkDateEnd !=''">
             and besci.check_date &lt;= #{request.checkDateEnd}
         </if>
-        <if test="businessKeys != null">
-            and besci.id in
-            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
         <if test="request != null and request.ids != null and request.ids.size() > 0">
             and bescra.id in
             <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
                 #{id}
             </foreach>
         </if>
+        <if test="businessKeys != null">
+            and bescra.id in
+            <foreach collection="businessKeys" item="id" index="index" open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY bescra.id
         ORDER BY bescra.create_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
index 076a2be..26b6733 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareInfoMapper.xml
@@ -28,7 +28,19 @@
         JOIN biz_resource_software_review_report brsrr ON brsi.report_id = brsrr.id
         WHERE 1=1
         <if test="request != null and request.softwareName != null and request.softwareName !=''">
-            and software_name = #{request.softwareName}
+            and brsrr.software_name like concat(#{request.softwareName},'%')
+        </if>
+        <if test="request != null and request.softwareVersion != null and request.softwareVersion !=''">
+            and brsrr.software_version like concat(#{request.softwareVersion},'%')
+        </if>
+        <if test="request != null and request.createUserName != null and request.createUserName !=''">
+            and brsi.create_user_name like concat('%',#{request.createUserName},'%')
+        </if>
+        <if test="request != null and request.updateTimeStart != null and request.updateTimeStart !=''">
+            and brsi.update_time &gt;= #{request.updateTimeStart}
+        </if>
+        <if test="request != null and request.updateTimeEnd != null and request.updateTimeEnd !=''">
+            and brsi.update_time &lt;= #{request.updateTimeEnd}
         </if>
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
index f67a9cd..644ca6b 100644
--- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceSoftwareRevisionApplyMapper.xml
@@ -51,6 +51,15 @@
         <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.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/SoftwareRevisionApplyApprovalListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
index 2543e5a..a4e5d63 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/file/SoftwareRevisionApplyApprovalListRequest.java
@@ -22,4 +22,13 @@
 
     @ApiModelProperty(value = "申请部门", dataType = "String")
     private String createDept;
+
+    @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/dto/resource/software/SoftwareInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
index 4fa6812..a1b1bd4 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/software/SoftwareInfoListRequest.java
@@ -12,4 +12,16 @@
 public class SoftwareInfoListRequest {
     @ApiModelProperty(value = "软件名", dataType = "String")
     private String softwareName;
+
+    @ApiModelProperty(value = "版本号", dataType = "String")
+    private String softwareVersion;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUserName;
+
+    @ApiModelProperty(value = "更新时间开始", dataType = "String")
+    private String updateTimeStart;
+
+    @ApiModelProperty(value = "更新时间结束", dataType = "String")
+    private String updateTimeEnd;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceEnvironmentResistance.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceEnvironmentResistance.java
index 5b83923..c02dd6a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceEnvironmentResistance.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceEnvironmentResistance.java
@@ -9,6 +9,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 
 /**
@@ -37,6 +38,16 @@
     @TableField("record_name")
     private String recordName;
 
+    @NotEmpty(message = "实验室代码不能为空")
+    @DictCodeField(message = "实验室代码描述不合法", cacheName = MeterDictCode.LAB_CODE)
+    @ApiModelProperty(value = "实验室代码(字典code)", dataType = "String")
+    @TableField("lab_code")
+    private String labCode;
+
+    @ApiModelProperty(value = "实验室代码(字典value)", dataType = "String")
+    @TableField(exist = false)
+    private String labCodeName;
+
     @ApiModelProperty(value = "测试时间", dataType = "String")
     @TableField("test_time")
     private String testTime;