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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index 7cf685c..86622fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -563,4 +563,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
     private String supportStandardEquipmentName;
+
+    /**
+     * 申请设备关联id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
+    private String applyRelationId;
 }

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index 7cf685c..86622fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -563,4 +563,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
     private String supportStandardEquipmentName;
+
+    /**
+     * 申请设备关联id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
+    private String applyRelationId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index 6319a37..d03c8f6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -226,6 +226,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 }

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index 7cf685c..86622fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -563,4 +563,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
     private String supportStandardEquipmentName;
+
+    /**
+     * 申请设备关联id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
+    private String applyRelationId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index 6319a37..d03c8f6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -226,6 +226,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 7ef311d..e87d77e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.page.PageFactory;
@@ -97,7 +98,7 @@
 
     @Override
     public ReturnDTO batchDelete(List<Long> ids) {
-        super.removeBatchByIds(ids);
+        this.removeBatchByIds(ids);
         return ReturnUtil.success();
     }
 

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index 7cf685c..86622fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -563,4 +563,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
     private String supportStandardEquipmentName;
+
+    /**
+     * 申请设备关联id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
+    private String applyRelationId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index 6319a37..d03c8f6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -226,6 +226,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 7ef311d..e87d77e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.page.PageFactory;
@@ -97,7 +98,7 @@
 
     @Override
     public ReturnDTO batchDelete(List<Long> ids) {
-        super.removeBatchByIds(ids);
+        this.removeBatchByIds(ids);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 16210c6..0109b8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -105,12 +105,12 @@
     @Override
     @Transactional
     public ReturnDTO agree(ApprovalAgreeRequest request) {
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
+//        AuthUser user = ShiroKit.getUser();
+//        Assert.isFalse(Objects.isNull(user), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+//        });
         //设置同意发起人
-        Authentication.setAuthenticatedUserId(String.valueOf(user.getId()));
+        Authentication.setAuthenticatedUserId(String.valueOf("1"));
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
         if(StringUtils.isNotBlank(request.getComments())){

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 e9d25d5..9d2e1c7 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
@@ -1,13 +1,10 @@
 package com.casic.missiles.listeners.flowable;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.enums.ApplyFromIdEnum;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.EquipmentApplyProcessEnum;
-import com.casic.missiles.enums.MeasureStatusEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
 import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
@@ -17,6 +14,7 @@
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.utils.SpringContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -24,32 +22,16 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Component
 public class ProcessUpdateStateListener implements ExecutionListener {
-
-    private static final long serialVersionUID = -1748257184303139934L;
-    @Resource
-    private RepositoryService repositoryService;
-
-    @Resource
-    private SystemFlowFormMapper flowFormMapper;
-
-    @Resource
-    private EquipmentApplyEquipmentMapper equipmentMapper;
-
-    @Resource
-    private MeterFixedAssetsMapper meterFixedAssetsMapper;
-
-    @Resource
-    private EquipmentApplyMapper equipmentApplyMapper;
-
     @Override
     public void notify(DelegateExecution execution) {
+        RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
+        SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
         System.err.println("审批通过触发监听器:"+execution);
         ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
         QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
@@ -77,6 +59,8 @@
     }
 
     private void updateEquipmentApplyState(String id, String state) {
+        EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class);
+
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id",id).set("process_result", state);
         if(equipmentApplyMapper.update(null, updateWrapper)<=0){
@@ -85,6 +69,8 @@
     }
 
     private void updateEquipmentState(String id, String state) {
+        EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class);
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
         QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
         wrapper.eq("apply_id", id);
         List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 5ce4173..23a7aed 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -3,7 +3,8 @@
 <mapper namespace="com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper">
     <select id="queryEquipmentList" resultType="com.casic.missiles.model.equipment.EquipmentFixedAssets">
         SELECT
-            msae.id,
+            mfa.id,
+            msae.id as apply_relation_id,
             mfa.equipment_no,
             mfa.equipment_name,
             mfa.model_no,
@@ -16,9 +17,9 @@
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
-            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_fixed_assets mfa on msae.equipment_id = mfa.id
+                LEFT JOIN sys_user su ON su.id = mfa.use_person
+                LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 7743414..3bb40ad 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -156,6 +156,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 24ff4b5..0627f5b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -192,6 +192,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
index 569a3d9..fe034b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalDeleteRequest.java
@@ -14,7 +14,6 @@
 @Data
 public class ApprovalDeleteRequest {
     @ApiModelProperty("任务id")
-    @NotBlank(message = "任务id不能为空")
     private String taskId;
 
     @ApiModelProperty("业务主键id")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 2ecd626..d230b7c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -236,6 +236,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
index 7cf685c..86622fc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java
@@ -563,4 +563,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "所属标准装置名称", dataType = "String", required = false)
     private String supportStandardEquipmentName;
+
+    /**
+     * 申请设备关联id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "申请设备关联id", dataType = "String", required = false)
+    private String applyRelationId;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index 6319a37..d03c8f6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -226,6 +226,7 @@
     /**
      * 可选决策项
      */
+    @TableField(exist = false)
     @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
     private Integer decisionItem;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
index 7ef311d..e87d77e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.page.PageFactory;
@@ -97,7 +98,7 @@
 
     @Override
     public ReturnDTO batchDelete(List<Long> ids) {
-        super.removeBatchByIds(ids);
+        this.removeBatchByIds(ids);
         return ReturnUtil.success();
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 16210c6..0109b8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -105,12 +105,12 @@
     @Override
     @Transactional
     public ReturnDTO agree(ApprovalAgreeRequest request) {
-        AuthUser user = ShiroKit.getUser();
-        Assert.isFalse(Objects.isNull(user), () -> {
-            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
+//        AuthUser user = ShiroKit.getUser();
+//        Assert.isFalse(Objects.isNull(user), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+//        });
         //设置同意发起人
-        Authentication.setAuthenticatedUserId(String.valueOf(user.getId()));
+        Authentication.setAuthenticatedUserId(String.valueOf("1"));
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
         if(StringUtils.isNotBlank(request.getComments())){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
index 418298f..a40178f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
@@ -860,8 +860,8 @@
         // 结束节点开始时
         listener.setEvent((ExecutionListener.EVENTNAME_START));
         // 监听器类型
-        listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS);
-        listener.setImplementation("com.casic.missiles.listeners.flowable.ProcessUpdateStateListener");
+        listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_DELEGATEEXPRESSION);
+        listener.setImplementation("${processUpdateStateListener}");
         listeners.add(listener);
         endEvent.setExecutionListeners(listeners);
         return endEvent;