diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
new file mode 100644
index 0000000..452feeb
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.model.workbench;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 审批通过通知消息
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Data
+@TableName("workbench_approval_message")
+public class WorkbenchApprovalMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 通知的用户id
+     */
+    @TableField("notice_id")
+    private Long noticeId;
+
+    /**
+     * 通知的用户部门id
+     */
+    @TableField("notice_dept_id")
+    private Long noticeDeptId;
+
+    /**
+     * 消息主题(标题，冗余)
+     */
+    @TableField("message_title")
+    private String messageTitle;
+
+    /**
+     * 消息内容（表单名字）
+     */
+    @TableField("message_content")
+    private String messageContent;
+
+    /**
+     * 前端表单id（用于区分业务类型及页面跳转）
+     */
+    @TableField("form_id")
+    private String formId;
+
+    /**
+     * 1已读0未读
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
new file mode 100644
index 0000000..452feeb
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.model.workbench;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 审批通过通知消息
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Data
+@TableName("workbench_approval_message")
+public class WorkbenchApprovalMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 通知的用户id
+     */
+    @TableField("notice_id")
+    private Long noticeId;
+
+    /**
+     * 通知的用户部门id
+     */
+    @TableField("notice_dept_id")
+    private Long noticeDeptId;
+
+    /**
+     * 消息主题(标题，冗余)
+     */
+    @TableField("message_title")
+    private String messageTitle;
+
+    /**
+     * 消息内容（表单名字）
+     */
+    @TableField("message_content")
+    private String messageContent;
+
+    /**
+     * 前端表单id（用于区分业务类型及页面跳转）
+     */
+    @TableField("form_id")
+    private String formId;
+
+    /**
+     * 1已读0未读
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index cf5144b..3bd316c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -21,10 +21,12 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
 import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog;
 import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService;
 import com.casic.missiles.utils.ConvertUtils;
@@ -67,6 +69,8 @@
     private MeterOrganizeMapper organizeMapper;
     @Autowired
     private AbstractDictService dictService;
+    @Autowired
+    private MeterStaffMapper staffMapper;
 
     @Override
     public Page<SampleHandOutListResponse> handOutListPage(Page<SampleHandOutListResponse> page, SampleHandOutListRequest handOutListRequest) throws Exception{
@@ -277,7 +281,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         String measureStatus = labExecutiveListRequest.getMeasureStatus();
         Page<SampleLabExecutiveListResponse> resultPage = new Page<>();
         switch (measureStatus) {
@@ -325,7 +333,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户待检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -346,7 +358,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -453,7 +469,12 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        if(request.getMeasurePersonId() != user.getId()){
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
+        if(request.getMeasurePersonId() != userId){
             throw new BusinessException(BusinessExceptionEnum.CANNOT_CHANGE_MEASURE_INFO);
         }
         BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo();
@@ -489,7 +510,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //删除实验室检测列表中退回数据
         int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId());
         //退回操作记录表中增加数据
@@ -534,6 +559,13 @@
         return wrapper;
     }
 
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return staffMapper.selectOne(wrapper);
+    }
+
     private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
         List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
         if (CollectionUtils.isEmpty(labExecutiveList)) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
new file mode 100644
index 0000000..452feeb
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.model.workbench;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 审批通过通知消息
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Data
+@TableName("workbench_approval_message")
+public class WorkbenchApprovalMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 通知的用户id
+     */
+    @TableField("notice_id")
+    private Long noticeId;
+
+    /**
+     * 通知的用户部门id
+     */
+    @TableField("notice_dept_id")
+    private Long noticeDeptId;
+
+    /**
+     * 消息主题(标题，冗余)
+     */
+    @TableField("message_title")
+    private String messageTitle;
+
+    /**
+     * 消息内容（表单名字）
+     */
+    @TableField("message_content")
+    private String messageContent;
+
+    /**
+     * 前端表单id（用于区分业务类型及页面跳转）
+     */
+    @TableField("form_id")
+    private String formId;
+
+    /**
+     * 1已读0未读
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index cf5144b..3bd316c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -21,10 +21,12 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
 import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog;
 import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService;
 import com.casic.missiles.utils.ConvertUtils;
@@ -67,6 +69,8 @@
     private MeterOrganizeMapper organizeMapper;
     @Autowired
     private AbstractDictService dictService;
+    @Autowired
+    private MeterStaffMapper staffMapper;
 
     @Override
     public Page<SampleHandOutListResponse> handOutListPage(Page<SampleHandOutListResponse> page, SampleHandOutListRequest handOutListRequest) throws Exception{
@@ -277,7 +281,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         String measureStatus = labExecutiveListRequest.getMeasureStatus();
         Page<SampleLabExecutiveListResponse> resultPage = new Page<>();
         switch (measureStatus) {
@@ -325,7 +333,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户待检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -346,7 +358,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -453,7 +469,12 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        if(request.getMeasurePersonId() != user.getId()){
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
+        if(request.getMeasurePersonId() != userId){
             throw new BusinessException(BusinessExceptionEnum.CANNOT_CHANGE_MEASURE_INFO);
         }
         BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo();
@@ -489,7 +510,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //删除实验室检测列表中退回数据
         int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId());
         //退回操作记录表中增加数据
@@ -534,6 +559,13 @@
         return wrapper;
     }
 
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return staffMapper.selectOne(wrapper);
+    }
+
     private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
         List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
         if (CollectionUtils.isEmpty(labExecutiveList)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4f91a9e..f6b3933 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -114,10 +114,13 @@
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
+            } else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200;
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(),sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
-        if (updateFlag > 0&&sampleUpdateFlag) {
+        if (updateFlag > 0 && sampleUpdateFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -143,7 +146,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -227,7 +230,7 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId,String measureContent, Long sampleId) {
+    private Integer sampleStatusCreator(Long orderId, String measureContent, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
new file mode 100644
index 0000000..452feeb
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.model.workbench;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 审批通过通知消息
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Data
+@TableName("workbench_approval_message")
+public class WorkbenchApprovalMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 通知的用户id
+     */
+    @TableField("notice_id")
+    private Long noticeId;
+
+    /**
+     * 通知的用户部门id
+     */
+    @TableField("notice_dept_id")
+    private Long noticeDeptId;
+
+    /**
+     * 消息主题(标题，冗余)
+     */
+    @TableField("message_title")
+    private String messageTitle;
+
+    /**
+     * 消息内容（表单名字）
+     */
+    @TableField("message_content")
+    private String messageContent;
+
+    /**
+     * 前端表单id（用于区分业务类型及页面跳转）
+     */
+    @TableField("form_id")
+    private String formId;
+
+    /**
+     * 1已读0未读
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index cf5144b..3bd316c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -21,10 +21,12 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
 import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog;
 import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService;
 import com.casic.missiles.utils.ConvertUtils;
@@ -67,6 +69,8 @@
     private MeterOrganizeMapper organizeMapper;
     @Autowired
     private AbstractDictService dictService;
+    @Autowired
+    private MeterStaffMapper staffMapper;
 
     @Override
     public Page<SampleHandOutListResponse> handOutListPage(Page<SampleHandOutListResponse> page, SampleHandOutListRequest handOutListRequest) throws Exception{
@@ -277,7 +281,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         String measureStatus = labExecutiveListRequest.getMeasureStatus();
         Page<SampleLabExecutiveListResponse> resultPage = new Page<>();
         switch (measureStatus) {
@@ -325,7 +333,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户待检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -346,7 +358,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -453,7 +469,12 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        if(request.getMeasurePersonId() != user.getId()){
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
+        if(request.getMeasurePersonId() != userId){
             throw new BusinessException(BusinessExceptionEnum.CANNOT_CHANGE_MEASURE_INFO);
         }
         BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo();
@@ -489,7 +510,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //删除实验室检测列表中退回数据
         int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId());
         //退回操作记录表中增加数据
@@ -534,6 +559,13 @@
         return wrapper;
     }
 
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return staffMapper.selectOne(wrapper);
+    }
+
     private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
         List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
         if (CollectionUtils.isEmpty(labExecutiveList)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4f91a9e..f6b3933 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -114,10 +114,13 @@
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
+            } else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200;
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(),sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
-        if (updateFlag > 0&&sampleUpdateFlag) {
+        if (updateFlag > 0 && sampleUpdateFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -143,7 +146,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -227,7 +230,7 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId,String measureContent, Long sampleId) {
+    private Integer sampleStatusCreator(Long orderId, String measureContent, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java
new file mode 100644
index 0000000..8d07e18
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.Impl.workbench;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批通过通知消息 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Service
+public class WorkbenchApprovalMessageServiceImpl extends ServiceImpl<WorkbenchApprovalMessageMapper, WorkbenchApprovalMessage> implements IWorkbenchApprovalMessageService {
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
index b062ecd..49469d5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessCertificatePrintController.java
@@ -70,11 +70,11 @@
      */
     @ApiOperation("证书审批-同意")
     @PostMapping("/agree")
-    public void agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
+    public ReturnDTO agreeAginPrint(@RequestBody @Valid ApprovalAgreeRequest request,BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.agreeAginPrint(request);
+        return certificatePrintService.agreeAginPrint(request);
     }
 
     /**
@@ -82,11 +82,11 @@
      */
     @ApiOperation("证书审批-拒绝")
     @PostMapping("/refuse")
-    public void refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
+    public ReturnDTO refuseAgainPrint(@RequestBody @Valid CertificateRefusePrintRequest request, BindingResult bindingResult) {
         if(bindingResult.hasErrors()){
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        certificatePrintService.refuseAgainPrint(request);
+       return certificatePrintService.refuseAgainPrint(request);
     }
 //
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index f21769e..276a13f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -66,11 +66,11 @@
      */
     @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
-    public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
+        return bizDispatchService.statusChange(deviceReceiveDTO);
     }
 
     /**
@@ -78,11 +78,11 @@
      */
     @ApiOperation("设备终止")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
+    public ReturnDTO forcedTerminate(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
         Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
+        return bizDispatchService.forcedTerminate(deviceReceiveDTO);
     }
 
     /**
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index a846ff2..e2d588a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -90,7 +90,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizExchangeService.deleteExchange(idDTO.getId()));
+        return bizExchangeService.deleteExchange(idDTO.getId());
     }
 
     @ApiOperation("设备交接单导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
index 7b09c44..5dcca11 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOrderController.java
@@ -108,7 +108,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
    //*******************************************************************************************************************//
@@ -118,7 +118,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"2"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"2");
    }
 
    //*******************************************************************************************************************//
@@ -128,7 +128,7 @@
       Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
          throw new BusinessException(BusinessExceptionEnum.ID_NULL);
       });
-      return ReturnUtil.success(businessOrderService.updateStatusById(idDTO.getId(),"3"));
+      return businessOrderService.updateStatusById(idDTO.getId(),"3");
    }
 
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
index 2c0697d..ce06426 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerAdviceController.java
@@ -60,7 +60,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.updateAdvice(customerAdviceInfo));
+        return customerAdviceService.updateAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉新增")
@@ -69,7 +69,7 @@
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return ReturnUtil.success(customerAdviceService.addAdvice(customerAdviceInfo));
+        return customerAdviceService.addAdvice(customerAdviceInfo);
     }
 
     @ApiOperation("客户投诉删除")
@@ -78,7 +78,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerAdviceService.deleteAdvice(idDTO.getId()));
+        return customerAdviceService.deleteAdvice(idDTO.getId());
     }
 
     //*******************************************************************************************************************//
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 36f3c61..7591c07 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -63,7 +63,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.addCustomer(customerInfo));
+        return customerService.addCustomer(customerInfo);
     }
 
     @ApiOperation("客户更新")
@@ -72,7 +72,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerService.updateCustomer(customerInfo));
+        return customerService.updateCustomer(customerInfo);
     }
 
     @ApiOperation("客户详情")
@@ -118,7 +118,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerService.deleteCustomer(idDTO.getId()));
+        return customerService.deleteCustomer(idDTO.getId());
     }
 
     @ApiOperation("根据客户id查询检定证书-分页")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 609d1d0..9909809 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -54,7 +54,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.addSample(customerSampleInfo));
+        return customerSampleService.addSample(customerSampleInfo);
     }
 
     @ApiOperation("样品编辑")
@@ -66,7 +66,7 @@
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
-        return ReturnUtil.success(customerSampleService.updateSample(customerSampleInfo));
+        return customerSampleService.updateSample(customerSampleInfo);
     }
 
     @ApiOperation("样品详情")
@@ -84,7 +84,7 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(customerSampleService.deleteSample(idDTO.getId()));
+        return customerSampleService.deleteSample(idDTO.getId());
     }
 
     @ApiOperation("样品导出")
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
new file mode 100644
index 0000000..32f67c9
--- /dev/null
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchApprovalMessageController.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.controller.workbench;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 审批通过通知消息 前端控制器
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@RestController
+@RequestMapping("/workbench/approvalMessage")
+public class WorkbenchApprovalMessageController {
+
+}
diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml
index 0374632..1542cb6 100644
--- a/casic-metering-api/src/main/resources/config/application.yml
+++ b/casic-metering-api/src/main/resources/config/application.yml
@@ -120,4 +120,4 @@
     #作者
     author: wangpeng
     #待生成对象表名
-    table-name: workbench_message
+    table-name: workbench_approval_message
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
index 02da89a..76c1ee7 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java
@@ -56,8 +56,8 @@
     COMPLETE_SAMPLE_NOT_EXIST(2411, "检测中不存在扫描收入的样品"),
     CANNOT_CHANGE_MEASURE_INFO(2412, "无法更改非当前登录用户的检测信息"),
     NON_EXIST_ORDER_OR_SAMPLE(2413, "不存在该委托单或该委托单下的样品"),
-    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败");
-
+    AGAIN_PRINT_SUBMIT_FAILED(2414, "再次打印提交处理失败"),
+    LOGIN_USER_NOT_STAFF(2415, "登录用户非计量人员");
 
     private Integer code;
     private String message;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index ff5e94e..e63ac86 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.excel.util.DateUtils;
 import cn.hutool.core.lang.Assert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.casic.missiles.enums.ApplyFromIdEnum;
@@ -16,12 +17,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.system.SystemFlowFormMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.equipment.EquipmentApply;
 import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
 import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.equipment.EquipmentStateChangeLog;
 import com.casic.missiles.model.system.SystemFlowForm;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.modular.system.dao.UserMapper;
+import com.casic.missiles.modular.system.model.User;
 import com.casic.missiles.utils.SpringContextUtil;
+import com.casic.missiles.utils.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.RepositoryService;
 import org.flowable.engine.delegate.DelegateExecution;
@@ -29,7 +35,6 @@
 import org.flowable.engine.repository.ProcessDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -91,6 +96,9 @@
                 updateCertificateState(Long.valueOf(id));
                 break;
         }
+
+        //审批通过，通知发起人
+        sendMessageAndSocket(execution, systemFlowForm);
     }
 
     private void updateEquipmentApplyState(String id, String state) {
@@ -119,44 +127,73 @@
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
             logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
-            if(stateChangeLogMapper.update(null, logUpdateWrapper)<=0){
+            if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) {
                 throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            };
+            }
+            ;
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
             // 新增状态变更记录
             for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) {
                 EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id), Long.parseLong(equipment.getEquipmentId()), state, DateUtils.format(new Date()), null, Long.parseLong(equipmentApply.getApplyPerson()));
-                if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+                if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
                     throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
                 }
             }
-        }else{
+        } else {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
     }
 
-        private void updateStandardState (String id, String state){
-            MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
-            UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.in("id", id).set("manager_state", state);
-            if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateStandardState(String id, String state) {
+        MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class);
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
 
-        private void updateCertificateState (Long id){
-            Assert.isFalse(Objects.isNull(id), () -> {
-                throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-            });
-            BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-            BusinessCertificateReport certificateReport = new BusinessCertificateReport();
-            certificateReport.setId(id);
-            certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
-            certificateReport.setPrintStatus("1"); //打印状态可打印
-            int row = certificateReportMapper.updateById(certificateReport);
-            if (row <= 0) {
-                throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
-            }
+    private void updateCertificateState(Long id) {
+        Assert.isFalse(Objects.isNull(id), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+        BusinessCertificateReport certificateReport = new BusinessCertificateReport();
+        certificateReport.setId(id);
+        certificateReport.setApprovalStatus(ApprovalStatusEnum.PASSED); //审批状态为审批中
+        certificateReport.setPrintStatus("1"); //打印状态可打印
+        int row = certificateReportMapper.updateById(certificateReport);
+        if (row <= 0) {
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
+    }
+
+    private void sendMessageAndSocket(DelegateExecution execution, SystemFlowForm systemFlowForm) {
+        JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
+        JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
+        Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
+        if (1 == noticeStarter) {
+            Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
+            String formName = workFlowDef.getString("formName");
+            String formId = systemFlowForm.getFormId();
+            //总工作台中需要展示所有业务的用户待审批的列表（查询每个业务的待审批进行组合）
+            //每个业务和前端定一个type（用formId即可，前提要保证流程定义和formId为一对一关系），用于前端页面跳转
+            WorkbenchApprovalMessageMapper approvalMessageMapper = SpringContextUtil.getBean(WorkbenchApprovalMessageMapper.class);
+            UserMapper userMapper = SpringContextUtil.getBean(UserMapper.class);
+            User user = userMapper.selectById(rootId);
+            WorkbenchApprovalMessage approvalMessage = new WorkbenchApprovalMessage();
+            approvalMessage.setNoticeId(rootId);
+            approvalMessage.setNoticeDeptId(user.getDeptId());
+            approvalMessage.setMessageTitle(null);
+            approvalMessage.setMessageContent(formName);
+            approvalMessage.setFormId(formId);
+            if (approvalMessageMapper.insert(approvalMessage) < 0) {
+                log.error("审批通过，通知发起人失败，approvalMessage：{}", approvalMessage.toString());
+            }
+            //websocket消息推送
+            WebSocket webSocket = SpringContextUtil.getBean(WebSocket.class);
+            webSocket.sendOneMessage(String.valueOf(rootId), JSONObject.toJSONString(approvalMessage));
+        }
+    }
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
new file mode 100644
index 0000000..dc6fc8b
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/workbench/WorkbenchApprovalMessageMapper.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.mapper.workbench;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface WorkbenchApprovalMessageMapper extends BaseMapper<WorkbenchApprovalMessage> {
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a496210..cb10b91 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -141,6 +141,7 @@
         appearance,
         rely_file AS "relyFile",
         bo.deliverer,
+        bo.deliver_time AS "deliverTime",
         bo.deliverer_tel AS "delivererTel",
         deliverer_sign_file AS "delivererSignFile",
         deliverer_sign_time AS "delivererSignTime",
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
new file mode 100644
index 0000000..a31eede
--- /dev/null
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.casic.missiles.model.workbench.WorkbenchApprovalMessage">
+        <id column="id" property="id" />
+        <result column="notice_id" property="noticeId" />
+        <result column="notice_dept_id" property="noticeDeptId" />
+        <result column="message_title" property="messageTitle" />
+        <result column="message_content" property="messageContent" />
+        <result column="form_id" property="formId" />
+        <result column="status" property="status" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+    </sql>
+
+</mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
index ecb13ff..80b26c2 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java
@@ -160,6 +160,11 @@
     /**
      * 送检人签名文件，minio存储文件名（为空时打印签字）
      */
+    @ApiModelProperty(value = "送检时间", dataType = "String")
+    private String delivererTime;
+    /**
+     * 送检人签名文件，minio存储文件名（为空时打印签字）
+     */
     @ApiModelProperty(value = "送检人(可改写，以实际送检人为准)", dataType = "String")
     @TableField("deliverer_tel")
     private String delivererTel;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
new file mode 100644
index 0000000..452feeb
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchApprovalMessage.java
@@ -0,0 +1,76 @@
+package com.casic.missiles.model.workbench;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 审批通过通知消息
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Data
+@TableName("workbench_approval_message")
+public class WorkbenchApprovalMessage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 通知的用户id
+     */
+    @TableField("notice_id")
+    private Long noticeId;
+
+    /**
+     * 通知的用户部门id
+     */
+    @TableField("notice_dept_id")
+    private Long noticeDeptId;
+
+    /**
+     * 消息主题(标题，冗余)
+     */
+    @TableField("message_title")
+    private String messageTitle;
+
+    /**
+     * 消息内容（表单名字）
+     */
+    @TableField("message_content")
+    private String messageContent;
+
+    /**
+     * 前端表单id（用于区分业务类型及页面跳转）
+     */
+    @TableField("form_id")
+    private String formId;
+
+    /**
+     * 1已读0未读
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private String createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private String updateTime;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index cf5144b..3bd316c 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -21,10 +21,12 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.*;
 import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
+import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessCertificateReport;
 import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
 import com.casic.missiles.model.business.BusinessLabExecutiveOperateLog;
 import com.casic.missiles.model.business.BusinessLabExecutiveTemplateInfo;
+import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService;
 import com.casic.missiles.service.business.IBusinessLabExecutiveTemplateInfoService;
 import com.casic.missiles.utils.ConvertUtils;
@@ -67,6 +69,8 @@
     private MeterOrganizeMapper organizeMapper;
     @Autowired
     private AbstractDictService dictService;
+    @Autowired
+    private MeterStaffMapper staffMapper;
 
     @Override
     public Page<SampleHandOutListResponse> handOutListPage(Page<SampleHandOutListResponse> page, SampleHandOutListRequest handOutListRequest) throws Exception{
@@ -277,7 +281,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         String measureStatus = labExecutiveListRequest.getMeasureStatus();
         Page<SampleLabExecutiveListResponse> resultPage = new Page<>();
         switch (measureStatus) {
@@ -325,7 +333,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户待检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -346,7 +358,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //查询扫描样品中为该用户检测中的样品列表
         List<SampleOperateRequest> preList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         if(CollectionUtils.isEmpty(preList)){
@@ -453,7 +469,12 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        if(request.getMeasurePersonId() != user.getId()){
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
+        if(request.getMeasurePersonId() != userId){
             throw new BusinessException(BusinessExceptionEnum.CANNOT_CHANGE_MEASURE_INFO);
         }
         BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo();
@@ -489,7 +510,11 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        Long userId = user.getId();
+        //登录用户id获取计量人员id，实验室检测信息中存储的是计量人员id
+        MeterStaff meterStaff = getMeterStaffInfo(user);
+        if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF);
+        Long userId = meterStaff.getId();
+
         //删除实验室检测列表中退回数据
         int deleteFlag = labExecutiveInfoMapper.deleteById(request.getId());
         //退回操作记录表中增加数据
@@ -534,6 +559,13 @@
         return wrapper;
     }
 
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return staffMapper.selectOne(wrapper);
+    }
+
     private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
         List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
         if (CollectionUtils.isEmpty(labExecutiveList)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 4f91a9e..f6b3933 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -114,10 +114,13 @@
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
+            } else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200;
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(),sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
-        if (updateFlag > 0&&sampleUpdateFlag) {
+        if (updateFlag > 0 && sampleUpdateFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -143,7 +146,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -227,7 +230,7 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId,String measureContent, Long sampleId) {
+    private Integer sampleStatusCreator(Long orderId, String measureContent, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java
new file mode 100644
index 0000000..8d07e18
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.service.Impl.workbench;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 审批通过通知消息 服务实现类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+@Service
+public class WorkbenchApprovalMessageServiceImpl extends ServiceImpl<WorkbenchApprovalMessageMapper, WorkbenchApprovalMessage> implements IWorkbenchApprovalMessageService {
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java
new file mode 100644
index 0000000..611cad0
--- /dev/null
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/workbench/IWorkbenchApprovalMessageService.java
@@ -0,0 +1,16 @@
+package com.casic.missiles.service.workbench;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+
+/**
+ * <p>
+ * 审批通过通知消息 服务类
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-24
+ */
+public interface IWorkbenchApprovalMessageService extends IService<WorkbenchApprovalMessage> {
+
+}