diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
index 36613de..8918886 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
@@ -20,6 +20,11 @@
     /**
      * 申请编号
      */
+    @ApiModelProperty(value = "表单id", dataType = "String")
+    private String formId;
+    /**
+     * 申请编号
+     */
     @ApiModelProperty(value = "申请编号", dataType = "String")
     private String applyNo;
 
@@ -84,4 +89,10 @@
     @ApiModelProperty(value = "导出ids", dataType = "List")
     private List<Long> ids;
 
+    /**
+     * 业务主键列表
+     */
+    @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List")
+    private List<String> businessKeys;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
index 36613de..8918886 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
@@ -20,6 +20,11 @@
     /**
      * 申请编号
      */
+    @ApiModelProperty(value = "表单id", dataType = "String")
+    private String formId;
+    /**
+     * 申请编号
+     */
     @ApiModelProperty(value = "申请编号", dataType = "String")
     private String applyNo;
 
@@ -84,4 +89,10 @@
     @ApiModelProperty(value = "导出ids", dataType = "List")
     private List<Long> ids;
 
+    /**
+     * 业务主键列表
+     */
+    @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List")
+    private List<String> businessKeys;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
index 0d0857d..1f0a575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
@@ -95,23 +95,30 @@
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 
-
     /**
      * 申请单位
      */
     @TableField("apply_unit")
-    @ExcelProperty(value = "申请单位",order = 2)
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String applyUnit;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请单位",order = 2)
+    @ApiModelProperty(value = "申请单位名称", dataType = "String")
+    private String applyUnitName;
+
     /**
      * 申请人
      */
     @TableField("apply_person")
-    @ExcelProperty(value = "申请人",order = 3)
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applyPerson;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请人",order = 3)
+    @ApiModelProperty(value = "申请人姓名", dataType = "String")
+    private String applyPersonName;
+
     /**
      * 领用时间/借用时间/闲置时间/封存时间/检修时间
      */
@@ -211,4 +218,11 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     private List<MeterEquipmentApplyFile> fileList;
 
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    private String taskId;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
index 36613de..8918886 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
@@ -20,6 +20,11 @@
     /**
      * 申请编号
      */
+    @ApiModelProperty(value = "表单id", dataType = "String")
+    private String formId;
+    /**
+     * 申请编号
+     */
     @ApiModelProperty(value = "申请编号", dataType = "String")
     private String applyNo;
 
@@ -84,4 +89,10 @@
     @ApiModelProperty(value = "导出ids", dataType = "List")
     private List<Long> ids;
 
+    /**
+     * 业务主键列表
+     */
+    @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List")
+    private List<String> businessKeys;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
index 0d0857d..1f0a575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
@@ -95,23 +95,30 @@
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 
-
     /**
      * 申请单位
      */
     @TableField("apply_unit")
-    @ExcelProperty(value = "申请单位",order = 2)
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String applyUnit;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请单位",order = 2)
+    @ApiModelProperty(value = "申请单位名称", dataType = "String")
+    private String applyUnitName;
+
     /**
      * 申请人
      */
     @TableField("apply_person")
-    @ExcelProperty(value = "申请人",order = 3)
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applyPerson;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请人",order = 3)
+    @ApiModelProperty(value = "申请人姓名", dataType = "String")
+    private String applyPersonName;
+
     /**
      * 领用时间/借用时间/闲置时间/封存时间/检修时间
      */
@@ -211,4 +218,11 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     private List<MeterEquipmentApplyFile> fileList;
 
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    private String taskId;
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 1bcc5e4..d6b34b9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -248,8 +248,10 @@
             //根据流程定义查询该业务所有未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -260,8 +262,10 @@
             //根据流程定义、登录用户id查询该业务未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .startedBy(String.valueOf(user.getId()))
                     .orderByProcessInstanceStartTime().desc()
                     .list();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
index 36613de..8918886 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
@@ -20,6 +20,11 @@
     /**
      * 申请编号
      */
+    @ApiModelProperty(value = "表单id", dataType = "String")
+    private String formId;
+    /**
+     * 申请编号
+     */
     @ApiModelProperty(value = "申请编号", dataType = "String")
     private String applyNo;
 
@@ -84,4 +89,10 @@
     @ApiModelProperty(value = "导出ids", dataType = "List")
     private List<Long> ids;
 
+    /**
+     * 业务主键列表
+     */
+    @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List")
+    private List<String> businessKeys;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
index 0d0857d..1f0a575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
@@ -95,23 +95,30 @@
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 
-
     /**
      * 申请单位
      */
     @TableField("apply_unit")
-    @ExcelProperty(value = "申请单位",order = 2)
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String applyUnit;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请单位",order = 2)
+    @ApiModelProperty(value = "申请单位名称", dataType = "String")
+    private String applyUnitName;
+
     /**
      * 申请人
      */
     @TableField("apply_person")
-    @ExcelProperty(value = "申请人",order = 3)
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applyPerson;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请人",order = 3)
+    @ApiModelProperty(value = "申请人姓名", dataType = "String")
+    private String applyPersonName;
+
     /**
      * 领用时间/借用时间/闲置时间/封存时间/检修时间
      */
@@ -211,4 +218,11 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     private List<MeterEquipmentApplyFile> fileList;
 
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    private String taskId;
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 1bcc5e4..d6b34b9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -248,8 +248,10 @@
             //根据流程定义查询该业务所有未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -260,8 +262,10 @@
             //根据流程定义、登录用户id查询该业务未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .startedBy(String.valueOf(user.getId()))
                     .orderByProcessInstanceStartTime().desc()
                     .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
index 37f2fa0..1969df9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
@@ -1,32 +1,42 @@
 package com.casic.missiles.service.Impl.meter;
 
 import cn.hutool.core.util.ObjectUtil;
-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.base.service.IBaseExportService;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
-import com.casic.missiles.enums.ApprovalStatusEnum;
-import com.casic.missiles.enums.EquipmentApplyEnum;
-import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterEquipmentApplyEquipmentMapper;
 import com.casic.missiles.mapper.meter.MeterEquipmentApplyMapper;
 import com.casic.missiles.model.*;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.meter.IMeterEquipmentApplyEquipmentService;
+import com.casic.missiles.service.meter.IMeterEquipmentApplyFileService;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service("MeterEquipmentApplyService")
 public class MeterEquipmentApplyServiceImpl extends ServiceImpl<MeterEquipmentApplyMapper, MeterEquipmentApply> implements MeterEquipmentApplyService {
@@ -35,21 +45,68 @@
     private MeterEquipmentApplyMapper equipmentApplyMapper;
 
     @Resource
-    private MeterEquipmentApplyService equipmentApplyService;
-
-    @Resource
     private MeterEquipmentApplyEquipmentMapper equipmentMapper;
 
     @Resource
     private IMeterEquipmentApplyEquipmentService equipmentService;
 
     @Resource
+    private IMeterEquipmentApplyFileService applyFileService;
+
+    @Resource
     private IBaseExportService iBaseExportService;
 
+    @Resource
+    private IBaseApprovalService baseApprovalService;
+
     @Override
     public Page<MeterEquipmentApply> equipmentApplyList(Page<MeterEquipmentApply> page, MeterEquipmentApplyRequest request) throws Exception {
+        List<String> businessKeys = new ArrayList<>();
+        boolean searchBusinessKey = true;
+        String status = request.getApprovalStatus();
+        Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        switch (status){
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            default:
+                // 全部 或 草稿箱，直接查表，不用查工作流
+                searchBusinessKey = false;
+                break;
+        }
+
+        if(searchBusinessKey){
+            if(CollectionUtils.isEmpty(businessKeys)){
+                return page;
+            }else {
+                request.setApprovalStatus(null);
+                request.setBusinessKeys(businessKeys);
+            }
+        }
+
         Page<MeterEquipmentApply> resultPage = equipmentApplyMapper.equipmentApplyList(page, request);
         for (MeterEquipmentApply meterEquipmentApply : resultPage.getRecords()) {
+            if(searchBusinessKey){
+                meterEquipmentApply.setApprovalStatus(status);
+            }
+            // todo 如果查全部，怎么设置审批状态
+            if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
+                meterEquipmentApply.setTaskId(taskMap.get(meterEquipmentApply.getId().toString()));
+            }
             DictCodeUtils.convertDictCodeToName(meterEquipmentApply);
         }
         return resultPage;
@@ -67,20 +124,27 @@
     @Override
     public ReturnDTO addEquipmentApply(MeterEquipmentApply meterEquipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
-        String applyNo = NumberGeneratorUtil.getContactNo(meterEquipmentApply.getApplyTypeName(), maxNo);
+        String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterEquipmentApply.getApplyType()), maxNo);
         meterEquipmentApply.setApplyNo(applyNo);
         meterEquipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        if(StringUtils.isEmpty(meterEquipmentApply.getCreateUser()) && ShiroKit.getUser() != null){
+            meterEquipmentApply.setCreateUser(ShiroKit.getUser().getId().toString());
+        }
         if(equipmentApplyMapper.insert(meterEquipmentApply) > 0){
             Long id = meterEquipmentApply.getId();
             for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) {
                 applyEquipment.setApplyId(id.toString());
             }
-            boolean equipmentSaveBatchFlg = equipmentService.saveBatch(meterEquipmentApply.getEquipmentList());
+            boolean equipmentSaveBatchFlg = true;
+            if(!CollectionUtils.isEmpty(meterEquipmentApply.getEquipmentList())){
+                equipmentSaveBatchFlg = equipmentService.saveBatch(meterEquipmentApply.getEquipmentList());
+            }
             boolean saveBatchFlg = true;
             if(ObjectUtil.isNotEmpty(meterEquipmentApply.getFileList()) && meterEquipmentApply.getFileList().size()!=0){
                 for (MeterEquipmentApplyFile file : meterEquipmentApply.getFileList()) {
                     file.setApplyId(id);
                 }
+                saveBatchFlg = applyFileService.saveBatch(meterEquipmentApply.getFileList());
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success();
@@ -91,6 +155,31 @@
         return ReturnUtil.failed("操作失败");
     }
 
+    private String getApplyNoPrefix(String applyType){
+        switch (applyType){
+            case EquipmentApplyTypeEnum.REQUIRE_APPLY:
+                return "sblysq";
+            case EquipmentApplyTypeEnum.BORROW_APPLY:
+                return "sbjysq";
+            case EquipmentApplyTypeEnum.IDEL_APPLY:
+                return "sbxzsq";
+            case EquipmentApplyTypeEnum.SEAL_APPLY:
+                return "sbfcsq";
+            case EquipmentApplyTypeEnum.UNSEAL_APPLY:
+                return "sbqfsq";
+            case EquipmentApplyTypeEnum.SCRAP_APPLY:
+                return "sbbfsq";
+            case EquipmentApplyTypeEnum.HANDLE_APPLY:
+                return "sbczsq";
+            case EquipmentApplyTypeEnum.EXAM_APPLY:
+                return "sbjx";
+            case EquipmentApplyTypeEnum.REPAIR_APPLY:
+                return "sbjxbyysd";
+            default:
+                return "";
+        }
+    }
+
     @Override
     public ReturnDTO deleteEquipmentApply(IdDTO idDto) {
         if(equipmentApplyMapper.deleteById(idDto.getId())>0){
@@ -126,7 +215,7 @@
     public void exportStaffList(MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<MeterEquipmentApply> resultList;
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = equipmentApplyService.listByIds(request.getIds());
+            resultList = this.listByIds(request.getIds());
         }else{
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
@@ -139,7 +228,7 @@
     @Override
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
@@ -149,10 +238,40 @@
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
         return ReturnUtil.failed("归还失败");
     }
+
+    @Override
+    public ReturnDTO updateProcessResult(MeterEquipmentApplyProcessRequest request) {
+        UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",request.getId()).set("process_result", request.getProcessResult());
+        if(equipmentApplyMapper.update(null, updateWrapper)>0){
+            return ReturnUtil.success();
+        }
+        return ReturnUtil.failed("处理失败");
+    }
+
+    @Override
+    public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
+        String formId = request.getFormId();
+
+        ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId());
+        if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){
+            return returnDTO;
+        }
+        ProcessInstance processInstance = (ProcessInstance)returnDTO.getData();
+
+        MeterEquipmentApply equipmentApply = this.baseMapper.selectById(request.getId());
+        equipmentApply.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态
+        equipmentApply.setProcessId(processInstance.getId());
+        int row = this.baseMapper.updateById(equipmentApply);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.TRACE_SUPPLIER_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.TRACE_SUPPLIER_SUBMIT_FAILED.getMessage());
+        }
+        return ReturnUtil.success();
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
index 33afc5b..0032b8b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterEquipmentApplyController.java
@@ -5,19 +5,26 @@
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.dto.meter.StandardEquipmentApplyRequest;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.MeterEquipmentApply;
 import com.casic.missiles.model.MeterStandardApply;
 import com.casic.missiles.model.MeterStandardEquipment;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.service.meter.MeterStandardApplyService;
+import com.casic.missiles.utils.DictCodeUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -43,6 +50,9 @@
     @Resource
     private MeterEquipmentApplyService meterEquipmentApplyService;
 
+    @Resource
+    private RepositoryService repositoryService;
+
     /**
      * 设备借用申请列表
      */
@@ -75,6 +85,16 @@
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
+    @ApiOperation("设备申请提交（必须先保存）")
+    @PostMapping("/submitEquipmentApply")
+    @ResponseBody
+    public ReturnDTO submitEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return meterEquipmentApplyService.submitEquipmentApply(request);
+    }
+
     /**
      * 设备借用申请列表删除
      */
@@ -129,4 +149,19 @@
         return meterEquipmentApplyService.returnEquipmentApply(idDto);
     }
 
+
+    @ApiOperation("更新设备处理状态（领用/退领）")
+    @PostMapping("/updateProcessResult")
+    @ResponseBody
+    public ReturnDTO updateProcessResult(@RequestBody @Valid MeterEquipmentApplyProcessRequest request) throws Exception {
+        DictCodeUtils.validDictCode(request);
+        return meterEquipmentApplyService.updateProcessResult(request);
+    }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public void test(String id){
+        repositoryService.deleteDeployment(id,true);
+    }
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
deleted file mode 100644
index df67852..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyEnum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.casic.missiles.enums;
-
-public enum EquipmentApplyEnum {
-
-    REPLACE_APPLY("1", "更换申请","ghsq"),
-    SUSPEND_APPLY("2", "暂停申请","ztsq"),
-    REVOKE_APPLY("3", "撤销申请","cxsq"),
-    RECOVERY_APPLY("4", "恢复申请","hfsq"),
-    REVIEW_APPLY("5", "复查申请","fcsq"),
-    COLLECT_APPLY("1", "设备领用申请","lysq"),
-    BORROW_APPLY("2", "设备借用申请","jysq"),
-    IDLE_APPLY("3", "设备闲置申请","xzsq"),
-    SEAL_APPLY("4", "设备封存申请","fcsq"),
-    UNSEAL_APPLY("5", "设备启封申请","qfsq"),
-    SCRAP_APPLY("6", "设备报废申请","bfsq"),
-    MANAGEMENT_APPLY("7", "设备处置申请","czsq"),
-    WAIT_BORROWED("1", "待借用",null),
-    ALREADY_BORROWED("2", "已借用",null),
-    ALREADY_RETURN("3", "已归还",null);
-
-    private String code;
-    private String value;
-    private String prefix;
-
-    EquipmentApplyEnum(String code, String value,String prefix) {
-        this.code = code;
-        this.value = value;
-        this.prefix = prefix;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
new file mode 100644
index 0000000..af602f0
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -0,0 +1,24 @@
+package com.casic.missiles.enums;
+
+public enum EquipmentApplyProcessEnum {
+
+    WAIT_BORROWED("1", "待借用"),
+    ALREADY_BORROWED("2", "已借用"),
+    ALREADY_RETURN("3", "已归还");
+
+    private final String code;
+    private final String value;
+
+    EquipmentApplyProcessEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
new file mode 100644
index 0000000..9fe8f18
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyTypeEnum.java
@@ -0,0 +1,42 @@
+package com.casic.missiles.enums;
+
+public class EquipmentApplyTypeEnum {
+
+    /**
+     * 设备领用申请
+     */
+    public static final String REQUIRE_APPLY = "1";
+    /**
+     * 设备借用申请
+     */
+    public static final String BORROW_APPLY = "2";
+    /**
+     * 设备闲置申请
+     */
+    public static final String IDEL_APPLY = "3";
+    /**
+     * 设备封存申请
+     */
+    public static final String SEAL_APPLY = "4";
+    /**
+     * 设备启封申请
+     */
+    public static final String UNSEAL_APPLY = "5";
+    /**
+     * 设备报废申请
+     */
+    public static final String SCRAP_APPLY = "6";
+    /**
+     * 设备报废申请
+     */
+    public static final String HANDLE_APPLY = "7";
+    /**
+     * 设备检修
+     */
+    public static final String EXAM_APPLY = "8";
+    /**
+     * 设备检修保养验收
+     */
+    public static final String REPAIR_APPLY = "9";
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
new file mode 100644
index 0000000..0930ba2
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/StandardApplyTypeEnum.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.enums;
+
+public enum StandardApplyTypeEnum {
+
+    REPLACE_APPLY("1", "更换申请"),
+    SUSPEND_APPLY("2", "暂停申请"),
+    REVOKE_APPLY("3", "撤销申请"),
+    RECOVERY_APPLY("4", "恢复申请"),
+    REVIEW_APPLY("5", "复查申请");
+
+
+    private String code;
+    private String value;
+
+    StandardApplyTypeEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
index ebbe6b9..68882b9 100644
--- a/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterEquipmentApplyMapper.xml
@@ -12,8 +12,8 @@
             msa.apply_type,
             msa.approval_status,
             msa.apply_name,
-            sd.SIMPLE_NAME as apply_unit,
-            su.`NAME` as apply_person,
+            sd.SIMPLE_NAME as apply_unit_name,
+            su.`NAME` as apply_person_name,
             DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time,
             msa.overhaul_person,
             msa.apply_desc,
@@ -58,6 +58,13 @@
         <if test="request.applyType != null and request.applyType !=''">
             and msa.apply_type = #{request.applyType}
         </if>
+        <if test="request.businessKeys != null and request.businessKeys.size() > 0">
+            and msa.id in
+            <foreach collection='request.businessKeys' item='id' open='(' separator=',' close=')'>
+                #{id}
+            </foreach>
+        </if>
+
         ORDER BY msa.create_time DESC
     </select>
     <select id="equipmentApplyInfo" resultType="com.casic.missiles.model.MeterEquipmentApply">
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 100a544..b27c287 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -74,6 +74,8 @@
     String STANDARD_APPLY_TYPE = "standardApplyType";
     //设备-申请类型
     String EQUIPMENT_APPLY_TYPE = "equipmentApplyType";
+    //设备-申请类型
+    String EQUIPMENT_APPLY_PROCESS_RESULT = "equipmentApplyProcessResult";
     //检查结果
     String CHECK_RESULT = "checkResult";
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
new file mode 100644
index 0000000..34a9398
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyProcessRequest.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.dto.meter;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 设备申请-修改设备处理结果请求
+ *
+ * @author zhangyingjie
+ */
+@Data
+@ApiModel
+public class MeterEquipmentApplyProcessRequest {
+
+    @NotNull(message = "主键ID不能为空")
+    @ApiModelProperty(value = "主键id", dataType = "Long", required = true)
+    private Long id;
+
+    @NotNull(message = "处理结果不能为空")
+    @ApiModelProperty(value = "处理结果（字典值）", dataType = "String", required = true)
+    @DictCodeField(message = "处理结果类型不合法", cacheName = MeterDictCode.EQUIPMENT_APPLY_PROCESS_RESULT)
+    private String processResult;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
index 36613de..8918886 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/meter/MeterEquipmentApplyRequest.java
@@ -20,6 +20,11 @@
     /**
      * 申请编号
      */
+    @ApiModelProperty(value = "表单id", dataType = "String")
+    private String formId;
+    /**
+     * 申请编号
+     */
     @ApiModelProperty(value = "申请编号", dataType = "String")
     private String applyNo;
 
@@ -84,4 +89,10 @@
     @ApiModelProperty(value = "导出ids", dataType = "List")
     private List<Long> ids;
 
+    /**
+     * 业务主键列表
+     */
+    @ApiModelProperty(value = "业务主键列表（工作流查询用，不用前端传）", dataType = "List")
+    private List<String> businessKeys;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
index 0d0857d..1f0a575 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/MeterEquipmentApply.java
@@ -95,23 +95,30 @@
     @ApiModelProperty(value = "申请名称", dataType = "String")
     private String applyName;
 
-
     /**
      * 申请单位
      */
     @TableField("apply_unit")
-    @ExcelProperty(value = "申请单位",order = 2)
     @ApiModelProperty(value = "申请单位", dataType = "String")
     private String applyUnit;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请单位",order = 2)
+    @ApiModelProperty(value = "申请单位名称", dataType = "String")
+    private String applyUnitName;
+
     /**
      * 申请人
      */
     @TableField("apply_person")
-    @ExcelProperty(value = "申请人",order = 3)
     @ApiModelProperty(value = "申请人", dataType = "String")
     private String applyPerson;
 
+    @TableField(exist = false)
+    @ExcelProperty(value = "申请人",order = 3)
+    @ApiModelProperty(value = "申请人姓名", dataType = "String")
+    private String applyPersonName;
+
     /**
      * 领用时间/借用时间/闲置时间/封存时间/检修时间
      */
@@ -211,4 +218,11 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     private List<MeterEquipmentApplyFile> fileList;
 
+    /**
+     * 任务id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
+    private String taskId;
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index 1bcc5e4..d6b34b9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -248,8 +248,10 @@
             //根据流程定义查询该业务所有未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .orderByProcessInstanceStartTime().desc()
                     .list();
         }else{
@@ -260,8 +262,10 @@
             //根据流程定义、登录用户id查询该业务未完成的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .deploymentId(flowForm.getDeployId())
+                    .or()
                     .unfinished()
-                    .or().processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .processInstanceBusinessStatus(ApprovalStatusEnum.IN_APPROVED) //查询审批中状态，因为驳回操作中设置为该状态
+                    .endOr()
                     .startedBy(String.valueOf(user.getId()))
                     .orderByProcessInstanceStartTime().desc()
                     .list();
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
index 37f2fa0..1969df9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterEquipmentApplyServiceImpl.java
@@ -1,32 +1,42 @@
 package com.casic.missiles.service.Impl.meter;
 
 import cn.hutool.core.util.ObjectUtil;
-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.base.service.IBaseExportService;
+import com.casic.missiles.core.shiro.ShiroKit;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
-import com.casic.missiles.enums.ApprovalStatusEnum;
-import com.casic.missiles.enums.EquipmentApplyEnum;
-import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.*;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterEquipmentApplyEquipmentMapper;
 import com.casic.missiles.mapper.meter.MeterEquipmentApplyMapper;
 import com.casic.missiles.model.*;
+import com.casic.missiles.model.response.ResponseData;
+import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.meter.IMeterEquipmentApplyEquipmentService;
+import com.casic.missiles.service.meter.IMeterEquipmentApplyFileService;
 import com.casic.missiles.service.meter.MeterEquipmentApplyService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service("MeterEquipmentApplyService")
 public class MeterEquipmentApplyServiceImpl extends ServiceImpl<MeterEquipmentApplyMapper, MeterEquipmentApply> implements MeterEquipmentApplyService {
@@ -35,21 +45,68 @@
     private MeterEquipmentApplyMapper equipmentApplyMapper;
 
     @Resource
-    private MeterEquipmentApplyService equipmentApplyService;
-
-    @Resource
     private MeterEquipmentApplyEquipmentMapper equipmentMapper;
 
     @Resource
     private IMeterEquipmentApplyEquipmentService equipmentService;
 
     @Resource
+    private IMeterEquipmentApplyFileService applyFileService;
+
+    @Resource
     private IBaseExportService iBaseExportService;
 
+    @Resource
+    private IBaseApprovalService baseApprovalService;
+
     @Override
     public Page<MeterEquipmentApply> equipmentApplyList(Page<MeterEquipmentApply> page, MeterEquipmentApplyRequest request) throws Exception {
+        List<String> businessKeys = new ArrayList<>();
+        boolean searchBusinessKey = true;
+        String status = request.getApprovalStatus();
+        Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        switch (status){
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            default:
+                // 全部 或 草稿箱，直接查表，不用查工作流
+                searchBusinessKey = false;
+                break;
+        }
+
+        if(searchBusinessKey){
+            if(CollectionUtils.isEmpty(businessKeys)){
+                return page;
+            }else {
+                request.setApprovalStatus(null);
+                request.setBusinessKeys(businessKeys);
+            }
+        }
+
         Page<MeterEquipmentApply> resultPage = equipmentApplyMapper.equipmentApplyList(page, request);
         for (MeterEquipmentApply meterEquipmentApply : resultPage.getRecords()) {
+            if(searchBusinessKey){
+                meterEquipmentApply.setApprovalStatus(status);
+            }
+            // todo 如果查全部，怎么设置审批状态
+            if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
+                meterEquipmentApply.setTaskId(taskMap.get(meterEquipmentApply.getId().toString()));
+            }
             DictCodeUtils.convertDictCodeToName(meterEquipmentApply);
         }
         return resultPage;
@@ -67,20 +124,27 @@
     @Override
     public ReturnDTO addEquipmentApply(MeterEquipmentApply meterEquipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
-        String applyNo = NumberGeneratorUtil.getContactNo(meterEquipmentApply.getApplyTypeName(), maxNo);
+        String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterEquipmentApply.getApplyType()), maxNo);
         meterEquipmentApply.setApplyNo(applyNo);
         meterEquipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT);
+        if(StringUtils.isEmpty(meterEquipmentApply.getCreateUser()) && ShiroKit.getUser() != null){
+            meterEquipmentApply.setCreateUser(ShiroKit.getUser().getId().toString());
+        }
         if(equipmentApplyMapper.insert(meterEquipmentApply) > 0){
             Long id = meterEquipmentApply.getId();
             for (MeterEquipmentApplyEquipment applyEquipment : meterEquipmentApply.getEquipmentList()) {
                 applyEquipment.setApplyId(id.toString());
             }
-            boolean equipmentSaveBatchFlg = equipmentService.saveBatch(meterEquipmentApply.getEquipmentList());
+            boolean equipmentSaveBatchFlg = true;
+            if(!CollectionUtils.isEmpty(meterEquipmentApply.getEquipmentList())){
+                equipmentSaveBatchFlg = equipmentService.saveBatch(meterEquipmentApply.getEquipmentList());
+            }
             boolean saveBatchFlg = true;
             if(ObjectUtil.isNotEmpty(meterEquipmentApply.getFileList()) && meterEquipmentApply.getFileList().size()!=0){
                 for (MeterEquipmentApplyFile file : meterEquipmentApply.getFileList()) {
                     file.setApplyId(id);
                 }
+                saveBatchFlg = applyFileService.saveBatch(meterEquipmentApply.getFileList());
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success();
@@ -91,6 +155,31 @@
         return ReturnUtil.failed("操作失败");
     }
 
+    private String getApplyNoPrefix(String applyType){
+        switch (applyType){
+            case EquipmentApplyTypeEnum.REQUIRE_APPLY:
+                return "sblysq";
+            case EquipmentApplyTypeEnum.BORROW_APPLY:
+                return "sbjysq";
+            case EquipmentApplyTypeEnum.IDEL_APPLY:
+                return "sbxzsq";
+            case EquipmentApplyTypeEnum.SEAL_APPLY:
+                return "sbfcsq";
+            case EquipmentApplyTypeEnum.UNSEAL_APPLY:
+                return "sbqfsq";
+            case EquipmentApplyTypeEnum.SCRAP_APPLY:
+                return "sbbfsq";
+            case EquipmentApplyTypeEnum.HANDLE_APPLY:
+                return "sbczsq";
+            case EquipmentApplyTypeEnum.EXAM_APPLY:
+                return "sbjx";
+            case EquipmentApplyTypeEnum.REPAIR_APPLY:
+                return "sbjxbyysd";
+            default:
+                return "";
+        }
+    }
+
     @Override
     public ReturnDTO deleteEquipmentApply(IdDTO idDto) {
         if(equipmentApplyMapper.deleteById(idDto.getId())>0){
@@ -126,7 +215,7 @@
     public void exportStaffList(MeterEquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<MeterEquipmentApply> resultList;
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = equipmentApplyService.listByIds(request.getIds());
+            resultList = this.listByIds(request.getIds());
         }else{
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
@@ -139,7 +228,7 @@
     @Override
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
@@ -149,10 +238,40 @@
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
         return ReturnUtil.failed("归还失败");
     }
+
+    @Override
+    public ReturnDTO updateProcessResult(MeterEquipmentApplyProcessRequest request) {
+        UpdateWrapper<MeterEquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",request.getId()).set("process_result", request.getProcessResult());
+        if(equipmentApplyMapper.update(null, updateWrapper)>0){
+            return ReturnUtil.success();
+        }
+        return ReturnUtil.failed("处理失败");
+    }
+
+    @Override
+    public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
+        String formId = request.getFormId();
+
+        ReturnDTO returnDTO = baseApprovalService.processSubmit(formId, request.getId());
+        if(ResponseData.DEFAULT_SUCCESS_CODE != returnDTO.getCode()){
+            return returnDTO;
+        }
+        ProcessInstance processInstance = (ProcessInstance)returnDTO.getData();
+
+        MeterEquipmentApply equipmentApply = this.baseMapper.selectById(request.getId());
+        equipmentApply.setApprovalStatus(ApprovalStatusEnum.UN_DRAFT); //非草稿状态
+        equipmentApply.setProcessId(processInstance.getId());
+        int row = this.baseMapper.updateById(equipmentApply);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.TRACE_SUPPLIER_SUBMIT_FAILED.getCode(), BusinessExceptionEnum.TRACE_SUPPLIER_SUBMIT_FAILED.getMessage());
+        }
+        return ReturnUtil.success();
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterEquipmentApplyService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterEquipmentApplyService.java
index 3cdb173..f824107 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterEquipmentApplyService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterEquipmentApplyService.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.meter.MeterEquipmentApplyProcessRequest;
 import com.casic.missiles.dto.meter.MeterEquipmentApplyRequest;
 import com.casic.missiles.model.MeterEquipmentApply;
 
@@ -26,4 +28,8 @@
     ReturnDTO borrowEquipmentApply(IdDTO idDto);
 
     ReturnDTO returnEquipmentApply(IdDTO idDto);
+
+    ReturnDTO updateProcessResult(MeterEquipmentApplyProcessRequest request);
+
+    ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request);
 }