diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index 0af53a1..c396e64 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -54,7 +54,7 @@
             and msa.approval_status = #{request.applyStatus}
         </if>
         <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-            and ea.approval_status = #{request.approvalStatus}
+            and msa.approval_status = #{request.approvalStatus}
         </if>
         <if test="request.businessKeys != null and request.businessKeys.size() > 0">
             and msa.id in

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index 0af53a1..c396e64 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -54,7 +54,7 @@
             and msa.approval_status = #{request.applyStatus}
         </if>
         <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-            and ea.approval_status = #{request.approvalStatus}
+            and msa.approval_status = #{request.approvalStatus}
         </if>
         <if test="request.businessKeys != null and request.businessKeys.size() > 0">
             and msa.id in
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 8339a0f..98ed714 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -57,10 +57,10 @@
         and CURRENT_TIMESTAMP >= mse.remind_time
         <include refid="Common_condition"/>
         <if test="request.validStartTime != null and request.validStartTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &gt;= #{request.validStartTime}
         </if>
         <if test="request.validEndTime != null and request.validEndTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &lt;= #{request.validEndTime}
         </if>
         ORDER BY mse.remind_time DESC
     </select>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index 0af53a1..c396e64 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -54,7 +54,7 @@
             and msa.approval_status = #{request.applyStatus}
         </if>
         <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-            and ea.approval_status = #{request.approvalStatus}
+            and msa.approval_status = #{request.approvalStatus}
         </if>
         <if test="request.businessKeys != null and request.businessKeys.size() > 0">
             and msa.id in
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 8339a0f..98ed714 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -57,10 +57,10 @@
         and CURRENT_TIMESTAMP >= mse.remind_time
         <include refid="Common_condition"/>
         <if test="request.validStartTime != null and request.validStartTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &gt;= #{request.validStartTime}
         </if>
         <if test="request.validEndTime != null and request.validEndTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &lt;= #{request.validEndTime}
         </if>
         ORDER BY mse.remind_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 3359997..1518a22 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -49,7 +49,7 @@
                 and msa.approval_status = #{request.applyStatus}
             </if>
             <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-                and ea.approval_status = #{request.approvalStatus}
+                and msa.approval_status = #{request.approvalStatus}
             </if>
             <if test="request.createUser != null and request.createUser !=''">
                 and msa.create_user = #{request.createUser}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index 0af53a1..c396e64 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -54,7 +54,7 @@
             and msa.approval_status = #{request.applyStatus}
         </if>
         <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-            and ea.approval_status = #{request.approvalStatus}
+            and msa.approval_status = #{request.approvalStatus}
         </if>
         <if test="request.businessKeys != null and request.businessKeys.size() > 0">
             and msa.id in
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 8339a0f..98ed714 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -57,10 +57,10 @@
         and CURRENT_TIMESTAMP >= mse.remind_time
         <include refid="Common_condition"/>
         <if test="request.validStartTime != null and request.validStartTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &gt;= #{request.validStartTime}
         </if>
         <if test="request.validEndTime != null and request.validEndTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &lt;= #{request.validEndTime}
         </if>
         ORDER BY mse.remind_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 3359997..1518a22 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -49,7 +49,7 @@
                 and msa.approval_status = #{request.applyStatus}
             </if>
             <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-                and ea.approval_status = #{request.approvalStatus}
+                and msa.approval_status = #{request.approvalStatus}
             </if>
             <if test="request.createUser != null and request.createUser !=''">
                 and msa.create_user = #{request.createUser}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java
new file mode 100644
index 0000000..540e93d
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.dto.equipment;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 测量设备-工作台响应实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2023/2/6
+ */
+@ApiModel
+@Data
+public class EquipmentWorkbenchResponse {
+
+    /**
+     * 标准装置总数
+     */
+    @ApiModelProperty(value = "标准装置总数", dataType = "String")
+    private String standardSum;
+
+    /**
+     * 标准装置状态
+     */
+    @ApiModelProperty(value = "标准装置状态", dataType = "String")
+    private String standardState;
+
+    /**
+     * 标准装置状态名称
+     */
+    @ApiModelProperty(value = "标准装置状态名称", dataType = "String")
+    private String standardCount;
+
+    /**
+     * 测量设备总数
+     */
+    @ApiModelProperty(value = "测量设备总数", dataType = "String")
+    private String measureSum;
+
+    /**
+     * 测量设备状态
+     */
+    @ApiModelProperty(value = "测量设备状态", dataType = "String")
+    private String measureState;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index 9e4bb5f..3129b39 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -36,6 +36,7 @@
     private IEquipmentAcceptanceCheckService iEquipmentAcceptanceCheckService;
 
     @Resource
+
     private IEquipmentApplyService iEquipmentApplyService;
 
     /**
@@ -84,15 +85,12 @@
     }
 
     /**
-     * 设设备检修保养验收单删除
+     * 设备检修保养验收单删除
      */
     @ApiOperation("设设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 5c2f7b8..1cd5911 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -39,7 +39,7 @@
  */
 
 @Slf4j
-@Api(tags = "设备借用/领用申请相关接口")
+@Api(tags = "设备借用,领用申请相关接口")
 @RestController
 @RequestMapping("/equipmentApply")
 public class EquipmentApplyController extends ExportController {
@@ -47,8 +47,6 @@
     @Resource
     private IEquipmentApplyService equipmentApplyService;
 
-    @Resource
-    private RepositoryService repositoryService;
 
     /**
      * 设备借用申请列表
@@ -97,10 +95,7 @@
     @ApiOperation("设备借用申请列表审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -157,7 +152,7 @@
         return equipmentApplyService.updateProcessResult(request);
     }
 
-    /*@RequestMapping("/test")
+ /*   @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/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index f5449fe..38259af 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -92,10 +92,7 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 909f187..3bb81b1 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -64,10 +64,7 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-        }
+    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
new file mode 100644
index 0000000..04f2868
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.controller.equipment;
+
+public class EquipmentWorkbenchController {
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
index 6442123..4b4a54a 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml
@@ -17,7 +17,7 @@
             ea.process_id,
             ea.process_result,
             ea.remark,
-            cea.acceptance_check_id
+            cea.acceptance_check_id AS acceptanceCheckId
         FROM
             equipment_apply ea
                 LEFT JOIN equipment_apply cea ON ea.id = cea.acceptance_check_id
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
index 0af53a1..c396e64 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml
@@ -54,7 +54,7 @@
             and msa.approval_status = #{request.applyStatus}
         </if>
         <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-            and ea.approval_status = #{request.approvalStatus}
+            and msa.approval_status = #{request.approvalStatus}
         </if>
         <if test="request.businessKeys != null and request.businessKeys.size() > 0">
             and msa.id in
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
index 8339a0f..98ed714 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml
@@ -57,10 +57,10 @@
         and CURRENT_TIMESTAMP >= mse.remind_time
         <include refid="Common_condition"/>
         <if test="request.validStartTime != null and request.validStartTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &gt;= #{request.validStartTime}
         </if>
         <if test="request.validEndTime != null and request.validEndTime != ''">
-
+            and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) &lt;= #{request.validEndTime}
         </if>
         ORDER BY mse.remind_time DESC
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
index 3359997..1518a22 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml
@@ -49,7 +49,7 @@
                 and msa.approval_status = #{request.applyStatus}
             </if>
             <if test="request.approvalStatus != null and request.approvalStatus !='' and request.approvalStatus != 0">
-                and ea.approval_status = #{request.approvalStatus}
+                and msa.approval_status = #{request.approvalStatus}
             </if>
             <if test="request.createUser != null and request.createUser !=''">
                 and msa.create_user = #{request.createUser}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java
new file mode 100644
index 0000000..540e93d
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentWorkbenchResponse.java
@@ -0,0 +1,47 @@
+package com.casic.missiles.dto.equipment;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 测量设备-工作台响应实体
+ * @author xiezhuangz
+ * @version 1.0
+ * @date 2023/2/6
+ */
+@ApiModel
+@Data
+public class EquipmentWorkbenchResponse {
+
+    /**
+     * 标准装置总数
+     */
+    @ApiModelProperty(value = "标准装置总数", dataType = "String")
+    private String standardSum;
+
+    /**
+     * 标准装置状态
+     */
+    @ApiModelProperty(value = "标准装置状态", dataType = "String")
+    private String standardState;
+
+    /**
+     * 标准装置状态名称
+     */
+    @ApiModelProperty(value = "标准装置状态名称", dataType = "String")
+    private String standardCount;
+
+    /**
+     * 测量设备总数
+     */
+    @ApiModelProperty(value = "测量设备总数", dataType = "String")
+    private String measureSum;
+
+    /**
+     * 测量设备状态
+     */
+    @ApiModelProperty(value = "测量设备状态", dataType = "String")
+    private String measureState;
+}
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 e02ddc0..6fb5fdf 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
@@ -62,11 +62,11 @@
             return ReturnUtil.failed("流程提交处理失败，该表单不存在对应的流程定义，请重新提交");
         }
         //流程发起人
-        AuthUser user = ShiroKit.getUser();
+        /*AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-        });
-        Authentication.setAuthenticatedUserId(String.valueOf(user.getId()));
+        });*/
+        Authentication.setAuthenticatedUserId(String.valueOf(0));
 
         //根据流程key（SystemFlowForm中的procDefId）获取流程id
         ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionKey(flowForm.getProcDefId()).latestVersion().singleResult();
@@ -79,7 +79,7 @@
 //        processVariables.put(FORM_VAR,formData);
 //        processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
 //        processVariables.put(START_USER_INFO, JSONObject.toJSONString(startUserInfo));
-        processVariables.put("root", String.valueOf(user.getId()));
+        processVariables.put("root", String.valueOf(0));
 
         ProcessInstanceBuilder processInstanceBuilder = runtimeService.createProcessInstanceBuilder();
         ProcessInstance processInstance = processInstanceBuilder
@@ -145,7 +145,7 @@
         }
         List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
         //管理员or其他用户
-        if(ShiroKit.isAdmin()){
+        if(true){
             //根据业务状态、流程定义查询该业务所有未通过的流程实例
             historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                     .processDefinitionKey(flowForm.getProcDefId())