diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index dbd054b..3345ca5 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -91,6 +91,10 @@
             case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL:
                 updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
                 break;
+            // 设备检修保养验收申请
+            case ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE:
+                acceptanceCheckUpdateState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
+                break;
             //证书打印审批通过状态回填
             case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL:
                 updateCertificateState(Long.valueOf(id));
@@ -135,6 +139,9 @@
             }
         }
     }
+    private void acceptanceCheckUpdateState(String id, String state) {
+
+    }
     /**
      * 审批通过后修改设备借用/领用状态
      * @param id
@@ -193,8 +200,13 @@
      */
     private void updateStandardState(String id, String state) {
         MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class);
+        QueryWrapper<EquipmentStandardApplyEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_apply_id",id);
+        List<EquipmentStandardApplyEquipment> equipments = applyEquipmentMapper.selectList(queryWrapper);
+        List<Long> equipmentIds = equipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", id).set("manager_state", state);
+        updateWrapper.in("id", equipmentIds).set("manager_state", state);
         if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index dbd054b..3345ca5 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -91,6 +91,10 @@
             case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL:
                 updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
                 break;
+            // 设备检修保养验收申请
+            case ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE:
+                acceptanceCheckUpdateState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
+                break;
             //证书打印审批通过状态回填
             case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL:
                 updateCertificateState(Long.valueOf(id));
@@ -135,6 +139,9 @@
             }
         }
     }
+    private void acceptanceCheckUpdateState(String id, String state) {
+
+    }
     /**
      * 审批通过后修改设备借用/领用状态
      * @param id
@@ -193,8 +200,13 @@
      */
     private void updateStandardState(String id, String state) {
         MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class);
+        QueryWrapper<EquipmentStandardApplyEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_apply_id",id);
+        List<EquipmentStandardApplyEquipment> equipments = applyEquipmentMapper.selectList(queryWrapper);
+        List<Long> equipmentIds = equipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", id).set("manager_state", state);
+        updateWrapper.in("id", equipmentIds).set("manager_state", state);
         if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 25ca988..35b5827 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -13,14 +13,10 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName,
-        mse.standard_no AS supportStandardEquipmentNo,
-        mse.standard_name AS supportStandardEquipmentName
+        su.name as usePersonName, sd.full_name as useDeptName
         FROM equipment_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
-        LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
         WHERE mfa.is_del = 0
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index dbd054b..3345ca5 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -91,6 +91,10 @@
             case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL:
                 updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
                 break;
+            // 设备检修保养验收申请
+            case ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE:
+                acceptanceCheckUpdateState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
+                break;
             //证书打印审批通过状态回填
             case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL:
                 updateCertificateState(Long.valueOf(id));
@@ -135,6 +139,9 @@
             }
         }
     }
+    private void acceptanceCheckUpdateState(String id, String state) {
+
+    }
     /**
      * 审批通过后修改设备借用/领用状态
      * @param id
@@ -193,8 +200,13 @@
      */
     private void updateStandardState(String id, String state) {
         MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class);
+        QueryWrapper<EquipmentStandardApplyEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_apply_id",id);
+        List<EquipmentStandardApplyEquipment> equipments = applyEquipmentMapper.selectList(queryWrapper);
+        List<Long> equipmentIds = equipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", id).set("manager_state", state);
+        updateWrapper.in("id", equipmentIds).set("manager_state", state);
         if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 25ca988..35b5827 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -13,14 +13,10 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName,
-        mse.standard_no AS supportStandardEquipmentNo,
-        mse.standard_name AS supportStandardEquipmentName
+        su.name as usePersonName, sd.full_name as useDeptName
         FROM equipment_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
-        LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
         WHERE mfa.is_del = 0
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 15b4613..7cb96f9 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -27,7 +27,7 @@
             and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ >= ]]> #{request.preparationStartDate}
         </if>
         <if test="request.preparationEndDate != null and request.preparationEndDate != ''">
-            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{preparationEndDate}
+            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{request.preparationEndDate}
         </if>
         <if test="request.id != null and request.id != ''">
             and mse.id = #{request.id}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index dbd054b..3345ca5 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -91,6 +91,10 @@
             case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL:
                 updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
                 break;
+            // 设备检修保养验收申请
+            case ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE:
+                acceptanceCheckUpdateState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
+                break;
             //证书打印审批通过状态回填
             case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL:
                 updateCertificateState(Long.valueOf(id));
@@ -135,6 +139,9 @@
             }
         }
     }
+    private void acceptanceCheckUpdateState(String id, String state) {
+
+    }
     /**
      * 审批通过后修改设备借用/领用状态
      * @param id
@@ -193,8 +200,13 @@
      */
     private void updateStandardState(String id, String state) {
         MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class);
+        QueryWrapper<EquipmentStandardApplyEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_apply_id",id);
+        List<EquipmentStandardApplyEquipment> equipments = applyEquipmentMapper.selectList(queryWrapper);
+        List<Long> equipmentIds = equipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", id).set("manager_state", state);
+        updateWrapper.in("id", equipmentIds).set("manager_state", state);
         if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 25ca988..35b5827 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -13,14 +13,10 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName,
-        mse.standard_no AS supportStandardEquipmentNo,
-        mse.standard_name AS supportStandardEquipmentName
+        su.name as usePersonName, sd.full_name as useDeptName
         FROM equipment_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
-        LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
         WHERE mfa.is_del = 0
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 15b4613..7cb96f9 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -27,7 +27,7 @@
             and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ >= ]]> #{request.preparationStartDate}
         </if>
         <if test="request.preparationEndDate != null and request.preparationEndDate != ''">
-            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{preparationEndDate}
+            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{request.preparationEndDate}
         </if>
         <if test="request.id != null and request.id != ''">
             and mse.id = #{request.id}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 69c225f..a7fe8f7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -77,6 +77,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY t1.valid_date DESC
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
index 9499a7e..a0352db 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java
@@ -130,7 +130,7 @@
     public void exportExcel(@RequestBody @Valid FixedAssetRequest request) throws Exception {
         List<EquipmentFixedAssets> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             list = iEquipmentFixedAssetsService.list(fixedAssetRequest);
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
index c8b6298..f8076ca 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java
@@ -100,7 +100,7 @@
     public void exportExcel(@RequestBody @Valid StandardEquipmentRequest request) throws Exception {
         List<EquipmentStandardEquipment> list;
         DictCodeUtils.validDictCode(request);
-        if(CollectionUtils.isEmpty(request.getIds())){
+        if(!CollectionUtils.isEmpty(request.getIds())){
             StandardEquipmentRequest standardEquipmentRequest = new StandardEquipmentRequest();
             standardEquipmentRequest.setIds(request.getIds());
             list = meterStandardEquipmentService.list(standardEquipmentRequest);
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
index d493bdd..4186936 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/config/swagger/SwaggerEntity.java
@@ -28,7 +28,7 @@
 
     /** 测量设备模块 */
     EQUIPMENT("测量设备模块",
-           basePackage("com.casic.missiles.controller.customer"),
+           basePackage("com.casic.missiles.controller.equipment"),
             PathSelectors.any()),
 
     /** 审批操作按钮 */
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index dbd054b..3345ca5 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -91,6 +91,10 @@
             case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL:
                 updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
                 break;
+            // 设备检修保养验收申请
+            case ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE:
+                acceptanceCheckUpdateState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);
+                break;
             //证书打印审批通过状态回填
             case ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL:
                 updateCertificateState(Long.valueOf(id));
@@ -135,6 +139,9 @@
             }
         }
     }
+    private void acceptanceCheckUpdateState(String id, String state) {
+
+    }
     /**
      * 审批通过后修改设备借用/领用状态
      * @param id
@@ -193,8 +200,13 @@
      */
     private void updateStandardState(String id, String state) {
         MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class);
+        QueryWrapper<EquipmentStandardApplyEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("standard_apply_id",id);
+        List<EquipmentStandardApplyEquipment> equipments = applyEquipmentMapper.selectList(queryWrapper);
+        List<Long> equipmentIds = equipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", id).set("manager_state", state);
+        updateWrapper.in("id", equipmentIds).set("manager_state", state);
         if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index 25ca988..35b5827 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -13,14 +13,10 @@
 
     <select id="listPage" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT <include refid="Base_Column_List"/>,
-        su.name as usePersonName, sd.full_name as useDeptName,
-        mse.standard_no AS supportStandardEquipmentNo,
-        mse.standard_name AS supportStandardEquipmentName
+        su.name as usePersonName, sd.full_name as useDeptName
         FROM equipment_fixed_assets mfa
         LEFT JOIN sys_user su ON su.id = mfa.use_person
         LEFT JOIN sys_dept sd on sd.id = mfa.use_dept
-        LEFT JOIN equipment_standard_support_equipment msse ON msse.equipment_id = mfa.id and msse.is_del != 1
-        LEFT JOIN equipment_standard_equipment mse ON msse.standard_equipment_id = mse.id and mse.is_del != 1
         WHERE mfa.is_del = 0
         <if test="fixedAssetRequest.id != null">
             and mfa.id = #{fixedAssetRequest.id}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 15b4613..7cb96f9 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -27,7 +27,7 @@
             and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ >= ]]> #{request.preparationStartDate}
         </if>
         <if test="request.preparationEndDate != null and request.preparationEndDate != ''">
-            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{preparationEndDate}
+            and DATE_FORMAT(mse.preparation_date,'%Y-%m-%d') <![CDATA[ <= ]]> #{request.preparationEndDate}
         </if>
         <if test="request.id != null and request.id != ''">
             and mse.id = #{request.id}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
index 69c225f..a7fe8f7 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterCertificateMapper.xml
@@ -77,6 +77,7 @@
                 </foreach>
             </if>
         </where>
+        ORDER BY t1.valid_date DESC
     </select>
     <select id="queryReminderList" resultType="com.casic.missiles.model.workbench.WorkbenchRemindMessage">
         SELECT
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java
index 564f0a1..fb4d8e9 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java
@@ -80,8 +80,8 @@
      * 使用部门
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false)
-    private Integer useDept;
+    @ApiModelProperty(value = "使用部门", dataType = "Long", required = false)
+    private Long useDept;
 
     /**
      * 使用部门名称