diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index c20feb0..0267df7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -23,6 +23,7 @@
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.enums.meter.MeterRoleTypeEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -179,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageSourceModuleEnum.METER.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -214,7 +215,9 @@
             // 补充业务数据
             for (WorkbenchRemindMessage message : messageList) {
                 message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageSourceModule(MessageSourceModuleEnum.METER.getCode());
                 message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setMessageTopic(MessageTypeEnum.METER_CERTIFICATE.getValue());
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index c20feb0..0267df7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -23,6 +23,7 @@
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.enums.meter.MeterRoleTypeEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -179,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageSourceModuleEnum.METER.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -214,7 +215,9 @@
             // 补充业务数据
             for (WorkbenchRemindMessage message : messageList) {
                 message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageSourceModule(MessageSourceModuleEnum.METER.getCode());
                 message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setMessageTopic(MessageTypeEnum.METER_CERTIFICATE.getValue());
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index f79bb8a..d62fa42 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -7,7 +7,9 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.node.ZTreeNode;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -43,8 +45,10 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -53,7 +57,6 @@
  * <p>
  * 计量管理-计量人员-计量人员表 服务实现类
  * </p>
- *
  */
 @Service("MeterStaffService")
 public class MeterStaffServiceImpl extends ServiceImpl<MeterStaffMapper, MeterStaff> implements MeterStaffService {
@@ -89,7 +92,7 @@
     private IMeterTrainStaffService trainStaffService;
 
     @Override
-    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page,MeterStaffRequest meterStaffRequest) {
+    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page, MeterStaffRequest meterStaffRequest) {
         Page<MeterStaff> meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest);
         meterStaffPage.setRecords(supplementList(meterStaffPage.getRecords()));
         return meterStaffPage;
@@ -101,7 +104,7 @@
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId()));
         // 通过人员信息的id获取人员对应的证书列表
         QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",idDto.getId());
+        wrapper.eq("staff_id", idDto.getId());
         List<MeterCertificate> meterCertificates = meterCertificateMapper.selectList(wrapper);
         meterStaff.setCertificateList(meterCertificates);
         return meterStaff;
@@ -109,7 +112,7 @@
 
     @Override
     public ReturnDTO deleteStaff(IdDTO idDto) {
-        if(meterStaffMapper.deleteById(idDto.getId())>0){
+        if (meterStaffMapper.deleteById(idDto.getId()) > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -119,11 +122,11 @@
     public Page<UserInfo> getUserList(String name, String deptId, Page<UserInfo> page) {
         QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(name), "name", name);
-        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id",deptId);
+        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id", deptId);
         Page<UserInfo> userInfoPage = userInfoMapper.selectPage(page, wrapper);
         userInfoPage.getRecords().forEach(user -> {
             Dept dept = deptMapper.selectById(user.getDeptId());
-            user.setDeptName(dept==null?"":dept.getFullName());
+            user.setDeptName(dept == null ? "" : dept.getFullName());
         });
         return userInfoPage;
     }
@@ -132,18 +135,18 @@
     @Transactional
     public ReturnDTO addStaffInfo(MeterStaff meterStaff) {
         QueryWrapper<MeterStaff> staffWrapper = new QueryWrapper<>();
-        staffWrapper.eq("account",meterStaff.getAccount());
+        staffWrapper.eq("account", meterStaff.getAccount());
         Long count = meterStaffMapper.selectCount(staffWrapper);
-        if(count!=0){
+        if (count != 0) {
             return ReturnUtil.failed("该用户已是计量人员");
         }
         long maxNo = meterStaffMapper.getMaxNo();
         meterStaff.setIsDel(0);
         String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo);
         meterStaff.setStaffNo(staffNo);
-        if(meterStaffMapper.insert(meterStaff)>0){
+        if (meterStaffMapper.insert(meterStaff) > 0) {
             Long id = meterStaff.getId();
-            meterStaff.getCertificateList().forEach(bean->{
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(id));
             });
             meterCertificateService.saveBatch(meterStaff.getCertificateList());
@@ -156,18 +159,18 @@
     public void exportStaffList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
         try {
             List<MeterStaff> meterStaffList;
-            if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+            if (!CollectionUtils.isEmpty(meterStaffRequest.getIds())) {
                 MeterStaffRequest request = new MeterStaffRequest();
                 request.setIds(meterStaffRequest.getIds());
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(request));
-            }else{
+            } else {
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
             }
-            meterStaffList.forEach(bean->{
-                bean.setSex(bean.getSex().equals("2")?"女":"男");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("0")?"已考核":"未考核");
+            meterStaffList.forEach(bean -> {
+                bean.setSex(bean.getSex().equals("2") ? "女" : "男");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("0") ? "已考核" : "未考核");
             });
-            iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList, ExportEnum.METER_STAFF.getSheetName());
+            iBaseExportService.exportExcel(response, MeterStaff.class, meterStaffList, ExportEnum.METER_STAFF.getSheetName());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -177,13 +180,13 @@
     @Transactional
     public ReturnDTO updateStaffInfo(MeterStaff meterStaff) {
         int updateFlag = meterStaffMapper.updateById(meterStaff);
-        if(updateFlag>0){
+        if (updateFlag > 0) {
             QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-            wrapper.eq("staff_id",meterStaff.getId());
-            meterStaff.getCertificateList().forEach(bean->{
+            wrapper.eq("staff_id", meterStaff.getId());
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(meterStaff.getId()));
             });
-            if(meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())){
+            if (meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())) {
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -203,89 +206,89 @@
         Map<String, List<Dict>> technologyJobDictMap = technologyJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<Dict>> administrationJobDictMap = administrationJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<ZTreeNode>> deptMap = deptList.stream().collect(Collectors.groupingBy(ZTreeNode::getName));
-        list.forEach(bean->{
+        list.forEach(bean -> {
             StringBuilder result = new StringBuilder();
             // 校验导入数据中的字典值是否存在
-            if(null == educationDictMap.get(bean.getEducation())){
+            if (null == educationDictMap.get(bean.getEducation())) {
                 result.append(BusinessExceptionEnum.EDUCATION_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == technologyJobDictMap.get(bean.getTechnologyJob())){
+            if (null == technologyJobDictMap.get(bean.getTechnologyJob())) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == administrationJobDictMap.get(bean.getAdministrationJob())){
+            if (null == administrationJobDictMap.get(bean.getAdministrationJob())) {
                 result.append(BusinessExceptionEnum.ADMINISTRATION_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == deptMap.get(bean.getDeptId())){
+            if (null == deptMap.get(bean.getDeptId())) {
                 result.append(BusinessExceptionEnum.DEPT_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的性别等信息是否正确
-            if(!(bean.getSex().equals("男")||bean.getSex().equals("女"))){
+            if (!(bean.getSex().equals("男") || bean.getSex().equals("女"))) {
                 result.append(BusinessExceptionEnum.SEX_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getMainExaminer().equals("是")||bean.getMainExaminer().equals("否"))){
+            if (!(bean.getMainExaminer().equals("是") || bean.getMainExaminer().equals("否"))) {
                 result.append(BusinessExceptionEnum.MAIN_EXAMINER_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getSpecialOperator().equals("是")||bean.getSpecialOperator().equals("否"))){
+            if (!(bean.getSpecialOperator().equals("是") || bean.getSpecialOperator().equals("否"))) {
                 result.append(BusinessExceptionEnum.SPECIAL_OPERATOR_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getTechnologyExam().equals("是")||bean.getTechnologyExam().equals("否"))){
+            if (!(bean.getTechnologyExam().equals("是") || bean.getTechnologyExam().equals("否"))) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_EXAM_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的日期格式是否规范
-            if(isDateFormat(bean.getValidDate())){
+            if (isDateFormat(bean.getValidDate())) {
                 result.append(BusinessExceptionEnum.VALID_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getWorkDate())){
+            if (isDateFormat(bean.getWorkDate())) {
                 result.append(BusinessExceptionEnum.WORK_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getBirthday())){
+            if (isDateFormat(bean.getBirthday())) {
                 result.append(BusinessExceptionEnum.BIRTHDAY_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getCertificateDate())){
+            if (isDateFormat(bean.getCertificateDate())) {
                 result.append(BusinessExceptionEnum.CERTIFICATE_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             bean.setResult(result.toString());
         });
-        if(checkResult.get()){
+        if (checkResult.get()) {
             // 校验通过
             AtomicLong maxNo = new AtomicLong(meterStaffMapper.getMaxNo());
-            list.forEach(bean->{
+            list.forEach(bean -> {
                 // 生成编号
                 String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo.get());
                 maxNo.set(Long.parseLong(staffNo.substring(4)));
                 bean.setStaffNo(staffNo);
                 // 获取id
-                Long id= IdWorker.getId();
+                Long id = IdWorker.getId();
                 bean.setId(id);
-                Long certificateId= IdWorker.getId();
+                Long certificateId = IdWorker.getId();
                 bean.setCertificateId(certificateId);
                 // 将数据的字典值替换
                 bean.setEducation(educationDictMap.get(bean.getEducation()).get(0).getCode());
                 bean.setTechnologyJob(technologyJobDictMap.get(bean.getTechnologyJob()).get(0).getCode());
                 bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode());
                 bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId());
-                bean.setSex(bean.getSex().equals("男")?"1":"2");
-                bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1");
-                bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1");
+                bean.setSex(bean.getSex().equals("男") ? "1" : "2");
+                bean.setMainExaminer(bean.getMainExaminer().equals("是") ? "0" : "1");
+                bean.setSpecialOperator(bean.getSpecialOperator().equals("是") ? "0" : "1");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("是") ? "0" : "1");
             });
             // 批量新增数据
             meterStaffMapper.addStaffList(list);
             meterCertificateMapper.addCertificateList(list);
             return ReturnUtil.success();
-        }else{
+        } else {
             // 校验不通过
             // 将处理后的数据导出成文件
             MultipartFile[] file = ExportUtils.exportMultipartFile(list, "checkResult", MeterStaffImport.class);
@@ -304,17 +307,17 @@
         try {
             DateUtil.parseDate(date);
             return false;
-        }catch (Exception e){
+        } catch (Exception e) {
             return true;
         }
     }
 
 
-    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList){
-        meterStaffList.forEach(bean->{
-            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,bean.getEducation()));
-            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,bean.getTechnologyJob()));
-            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,bean.getAdministrationJob()));
+    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList) {
+        meterStaffList.forEach(bean -> {
+            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
+            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
+            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
             bean.setDeptId(deptMapper.selectById(bean.getDeptId()).getFullName());
         });
         return meterStaffList;
@@ -334,11 +337,31 @@
     @Transactional
     public ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list) {
         QueryWrapper<MeterTrainStaff> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",list.get(0).getStaffId());
-        if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){
+        wrapper.eq("staff_id", list.get(0).getStaffId());
+        if (trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        AuthUser authUser = ShiroKit.getUser();
+        MeterStaff meterStaff = getMeterStaffInfo(authUser);
+        HashMap<String, Integer> map = new HashMap<>();
+        if (Objects.isNull(meterStaff)) {
+            map.put("isMeterStaff", 0);
+        }else {
+            map.put("isMeterStaff", 1);
+        }
+        return ReturnUtil.success(map);
+    }
+
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return meterStaffMapper.selectOne(wrapper);
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index c20feb0..0267df7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -23,6 +23,7 @@
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.enums.meter.MeterRoleTypeEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -179,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageSourceModuleEnum.METER.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -214,7 +215,9 @@
             // 补充业务数据
             for (WorkbenchRemindMessage message : messageList) {
                 message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageSourceModule(MessageSourceModuleEnum.METER.getCode());
                 message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setMessageTopic(MessageTypeEnum.METER_CERTIFICATE.getValue());
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index f79bb8a..d62fa42 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -7,7 +7,9 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.node.ZTreeNode;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -43,8 +45,10 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -53,7 +57,6 @@
  * <p>
  * 计量管理-计量人员-计量人员表 服务实现类
  * </p>
- *
  */
 @Service("MeterStaffService")
 public class MeterStaffServiceImpl extends ServiceImpl<MeterStaffMapper, MeterStaff> implements MeterStaffService {
@@ -89,7 +92,7 @@
     private IMeterTrainStaffService trainStaffService;
 
     @Override
-    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page,MeterStaffRequest meterStaffRequest) {
+    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page, MeterStaffRequest meterStaffRequest) {
         Page<MeterStaff> meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest);
         meterStaffPage.setRecords(supplementList(meterStaffPage.getRecords()));
         return meterStaffPage;
@@ -101,7 +104,7 @@
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId()));
         // 通过人员信息的id获取人员对应的证书列表
         QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",idDto.getId());
+        wrapper.eq("staff_id", idDto.getId());
         List<MeterCertificate> meterCertificates = meterCertificateMapper.selectList(wrapper);
         meterStaff.setCertificateList(meterCertificates);
         return meterStaff;
@@ -109,7 +112,7 @@
 
     @Override
     public ReturnDTO deleteStaff(IdDTO idDto) {
-        if(meterStaffMapper.deleteById(idDto.getId())>0){
+        if (meterStaffMapper.deleteById(idDto.getId()) > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -119,11 +122,11 @@
     public Page<UserInfo> getUserList(String name, String deptId, Page<UserInfo> page) {
         QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(name), "name", name);
-        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id",deptId);
+        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id", deptId);
         Page<UserInfo> userInfoPage = userInfoMapper.selectPage(page, wrapper);
         userInfoPage.getRecords().forEach(user -> {
             Dept dept = deptMapper.selectById(user.getDeptId());
-            user.setDeptName(dept==null?"":dept.getFullName());
+            user.setDeptName(dept == null ? "" : dept.getFullName());
         });
         return userInfoPage;
     }
@@ -132,18 +135,18 @@
     @Transactional
     public ReturnDTO addStaffInfo(MeterStaff meterStaff) {
         QueryWrapper<MeterStaff> staffWrapper = new QueryWrapper<>();
-        staffWrapper.eq("account",meterStaff.getAccount());
+        staffWrapper.eq("account", meterStaff.getAccount());
         Long count = meterStaffMapper.selectCount(staffWrapper);
-        if(count!=0){
+        if (count != 0) {
             return ReturnUtil.failed("该用户已是计量人员");
         }
         long maxNo = meterStaffMapper.getMaxNo();
         meterStaff.setIsDel(0);
         String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo);
         meterStaff.setStaffNo(staffNo);
-        if(meterStaffMapper.insert(meterStaff)>0){
+        if (meterStaffMapper.insert(meterStaff) > 0) {
             Long id = meterStaff.getId();
-            meterStaff.getCertificateList().forEach(bean->{
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(id));
             });
             meterCertificateService.saveBatch(meterStaff.getCertificateList());
@@ -156,18 +159,18 @@
     public void exportStaffList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
         try {
             List<MeterStaff> meterStaffList;
-            if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+            if (!CollectionUtils.isEmpty(meterStaffRequest.getIds())) {
                 MeterStaffRequest request = new MeterStaffRequest();
                 request.setIds(meterStaffRequest.getIds());
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(request));
-            }else{
+            } else {
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
             }
-            meterStaffList.forEach(bean->{
-                bean.setSex(bean.getSex().equals("2")?"女":"男");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("0")?"已考核":"未考核");
+            meterStaffList.forEach(bean -> {
+                bean.setSex(bean.getSex().equals("2") ? "女" : "男");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("0") ? "已考核" : "未考核");
             });
-            iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList, ExportEnum.METER_STAFF.getSheetName());
+            iBaseExportService.exportExcel(response, MeterStaff.class, meterStaffList, ExportEnum.METER_STAFF.getSheetName());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -177,13 +180,13 @@
     @Transactional
     public ReturnDTO updateStaffInfo(MeterStaff meterStaff) {
         int updateFlag = meterStaffMapper.updateById(meterStaff);
-        if(updateFlag>0){
+        if (updateFlag > 0) {
             QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-            wrapper.eq("staff_id",meterStaff.getId());
-            meterStaff.getCertificateList().forEach(bean->{
+            wrapper.eq("staff_id", meterStaff.getId());
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(meterStaff.getId()));
             });
-            if(meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())){
+            if (meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())) {
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -203,89 +206,89 @@
         Map<String, List<Dict>> technologyJobDictMap = technologyJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<Dict>> administrationJobDictMap = administrationJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<ZTreeNode>> deptMap = deptList.stream().collect(Collectors.groupingBy(ZTreeNode::getName));
-        list.forEach(bean->{
+        list.forEach(bean -> {
             StringBuilder result = new StringBuilder();
             // 校验导入数据中的字典值是否存在
-            if(null == educationDictMap.get(bean.getEducation())){
+            if (null == educationDictMap.get(bean.getEducation())) {
                 result.append(BusinessExceptionEnum.EDUCATION_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == technologyJobDictMap.get(bean.getTechnologyJob())){
+            if (null == technologyJobDictMap.get(bean.getTechnologyJob())) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == administrationJobDictMap.get(bean.getAdministrationJob())){
+            if (null == administrationJobDictMap.get(bean.getAdministrationJob())) {
                 result.append(BusinessExceptionEnum.ADMINISTRATION_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == deptMap.get(bean.getDeptId())){
+            if (null == deptMap.get(bean.getDeptId())) {
                 result.append(BusinessExceptionEnum.DEPT_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的性别等信息是否正确
-            if(!(bean.getSex().equals("男")||bean.getSex().equals("女"))){
+            if (!(bean.getSex().equals("男") || bean.getSex().equals("女"))) {
                 result.append(BusinessExceptionEnum.SEX_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getMainExaminer().equals("是")||bean.getMainExaminer().equals("否"))){
+            if (!(bean.getMainExaminer().equals("是") || bean.getMainExaminer().equals("否"))) {
                 result.append(BusinessExceptionEnum.MAIN_EXAMINER_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getSpecialOperator().equals("是")||bean.getSpecialOperator().equals("否"))){
+            if (!(bean.getSpecialOperator().equals("是") || bean.getSpecialOperator().equals("否"))) {
                 result.append(BusinessExceptionEnum.SPECIAL_OPERATOR_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getTechnologyExam().equals("是")||bean.getTechnologyExam().equals("否"))){
+            if (!(bean.getTechnologyExam().equals("是") || bean.getTechnologyExam().equals("否"))) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_EXAM_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的日期格式是否规范
-            if(isDateFormat(bean.getValidDate())){
+            if (isDateFormat(bean.getValidDate())) {
                 result.append(BusinessExceptionEnum.VALID_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getWorkDate())){
+            if (isDateFormat(bean.getWorkDate())) {
                 result.append(BusinessExceptionEnum.WORK_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getBirthday())){
+            if (isDateFormat(bean.getBirthday())) {
                 result.append(BusinessExceptionEnum.BIRTHDAY_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getCertificateDate())){
+            if (isDateFormat(bean.getCertificateDate())) {
                 result.append(BusinessExceptionEnum.CERTIFICATE_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             bean.setResult(result.toString());
         });
-        if(checkResult.get()){
+        if (checkResult.get()) {
             // 校验通过
             AtomicLong maxNo = new AtomicLong(meterStaffMapper.getMaxNo());
-            list.forEach(bean->{
+            list.forEach(bean -> {
                 // 生成编号
                 String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo.get());
                 maxNo.set(Long.parseLong(staffNo.substring(4)));
                 bean.setStaffNo(staffNo);
                 // 获取id
-                Long id= IdWorker.getId();
+                Long id = IdWorker.getId();
                 bean.setId(id);
-                Long certificateId= IdWorker.getId();
+                Long certificateId = IdWorker.getId();
                 bean.setCertificateId(certificateId);
                 // 将数据的字典值替换
                 bean.setEducation(educationDictMap.get(bean.getEducation()).get(0).getCode());
                 bean.setTechnologyJob(technologyJobDictMap.get(bean.getTechnologyJob()).get(0).getCode());
                 bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode());
                 bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId());
-                bean.setSex(bean.getSex().equals("男")?"1":"2");
-                bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1");
-                bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1");
+                bean.setSex(bean.getSex().equals("男") ? "1" : "2");
+                bean.setMainExaminer(bean.getMainExaminer().equals("是") ? "0" : "1");
+                bean.setSpecialOperator(bean.getSpecialOperator().equals("是") ? "0" : "1");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("是") ? "0" : "1");
             });
             // 批量新增数据
             meterStaffMapper.addStaffList(list);
             meterCertificateMapper.addCertificateList(list);
             return ReturnUtil.success();
-        }else{
+        } else {
             // 校验不通过
             // 将处理后的数据导出成文件
             MultipartFile[] file = ExportUtils.exportMultipartFile(list, "checkResult", MeterStaffImport.class);
@@ -304,17 +307,17 @@
         try {
             DateUtil.parseDate(date);
             return false;
-        }catch (Exception e){
+        } catch (Exception e) {
             return true;
         }
     }
 
 
-    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList){
-        meterStaffList.forEach(bean->{
-            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,bean.getEducation()));
-            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,bean.getTechnologyJob()));
-            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,bean.getAdministrationJob()));
+    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList) {
+        meterStaffList.forEach(bean -> {
+            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
+            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
+            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
             bean.setDeptId(deptMapper.selectById(bean.getDeptId()).getFullName());
         });
         return meterStaffList;
@@ -334,11 +337,31 @@
     @Transactional
     public ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list) {
         QueryWrapper<MeterTrainStaff> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",list.get(0).getStaffId());
-        if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){
+        wrapper.eq("staff_id", list.get(0).getStaffId());
+        if (trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        AuthUser authUser = ShiroKit.getUser();
+        MeterStaff meterStaff = getMeterStaffInfo(authUser);
+        HashMap<String, Integer> map = new HashMap<>();
+        if (Objects.isNull(meterStaff)) {
+            map.put("isMeterStaff", 0);
+        }else {
+            map.put("isMeterStaff", 1);
+        }
+        return ReturnUtil.success(map);
+    }
+
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return meterStaffMapper.selectOne(wrapper);
+    }
+
 }
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
index 8d07e18..f422426 100644
--- 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
@@ -1,10 +1,25 @@
 package com.casic.missiles.service.Impl.workbench;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
 import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -16,5 +31,59 @@
  */
 @Service
 public class WorkbenchApprovalMessageServiceImpl extends ServiceImpl<WorkbenchApprovalMessageMapper, WorkbenchApprovalMessage> implements IWorkbenchApprovalMessageService {
+    @Autowired
+    private IBaseApprovalService baseApprovalService;
 
+    @Autowired
+    private WorkbenchApprovalMessageMapper approvalMessageMapper;
+
+    @Override
+    public List<WorkbenchApprovalMessage> listPage(Page<WorkbenchApprovalMessage> page, ApprovalMessageRequest approvalMessageRequest) {
+        //所有业务待审批列表封装为消息
+        //计量管理：计量文件、培训计划、溯源供方
+        //测量设备：标准装置：更换、暂停、撤销、恢复、复查；
+        //         状态管理：闲置、封存、启封、报废、处置，维护：检修、保养，领用，借用这些都在状态管理里，对应枚举：EquipmentApplyTypeEnum
+        //业务管理：分包方资格、项目申请、项目验收，现场检测
+        // TODO: 2023/4/21 多线程优化查询，分页
+        List<WorkbenchApprovalMessage> resultList = new ArrayList<>();
+        if(Objects.nonNull(approvalMessageRequest.getStatus()) && 1 == approvalMessageRequest.getStatus()){
+            for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) {
+                if(StringUtils.isNotEmpty(approvalMessageRequest.getMessageSourceModule()) &&
+                        applyFromIdEnum.getSource().equals(approvalMessageRequest.getMessageSourceModule())){
+                    continue;
+                }
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode());
+                if(CollectionUtils.isEmpty(toBeApprovedList)){
+                    continue;
+                }
+                toBeApprovedList.forEach(a -> {
+                    WorkbenchApprovalMessage message = new WorkbenchApprovalMessage();
+                    message.setCreateTime(a.getCreateTime());
+                    message.setFormId(applyFromIdEnum.getCode());
+                    message.setMessageSourceModule(applyFromIdEnum.getSource());
+                    message.setMessageTitle("待审批通知");
+                    message.setMessageContent(applyFromIdEnum.getValue());
+                    message.setStatus(0);//待审批消息都是未读/未处理，处理后就不会在这个列表显示
+                    resultList.add(message);
+                });
+            }
+        }
+        //通知消息
+        QueryWrapper<WorkbenchApprovalMessage> wrapper = new QueryWrapper<>();
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getNoticeId()), "notice_id", approvalMessageRequest.getNoticeId());
+        wrapper.eq(StringUtils.isNotBlank(approvalMessageRequest.getMessageSourceModule()), "message_source_module", approvalMessageRequest.getMessageSourceModule());
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getStatus()), "status", approvalMessageRequest.getStatus());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getStartTime()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getEndTime()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getEndTime());
+        List<WorkbenchApprovalMessage> list = approvalMessageMapper.selectList(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            resultList.addAll(list);
+        }
+        //按时间排序组装
+        List<WorkbenchApprovalMessage> finalList = resultList.stream().sorted(Comparator.comparing(WorkbenchApprovalMessage::getCreateTime).reversed()).collect(Collectors.toList());
+
+        return finalList;
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index c20feb0..0267df7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -23,6 +23,7 @@
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.enums.meter.MeterRoleTypeEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -179,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageSourceModuleEnum.METER.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -214,7 +215,9 @@
             // 补充业务数据
             for (WorkbenchRemindMessage message : messageList) {
                 message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageSourceModule(MessageSourceModuleEnum.METER.getCode());
                 message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setMessageTopic(MessageTypeEnum.METER_CERTIFICATE.getValue());
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index f79bb8a..d62fa42 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -7,7 +7,9 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.node.ZTreeNode;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -43,8 +45,10 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -53,7 +57,6 @@
  * <p>
  * 计量管理-计量人员-计量人员表 服务实现类
  * </p>
- *
  */
 @Service("MeterStaffService")
 public class MeterStaffServiceImpl extends ServiceImpl<MeterStaffMapper, MeterStaff> implements MeterStaffService {
@@ -89,7 +92,7 @@
     private IMeterTrainStaffService trainStaffService;
 
     @Override
-    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page,MeterStaffRequest meterStaffRequest) {
+    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page, MeterStaffRequest meterStaffRequest) {
         Page<MeterStaff> meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest);
         meterStaffPage.setRecords(supplementList(meterStaffPage.getRecords()));
         return meterStaffPage;
@@ -101,7 +104,7 @@
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId()));
         // 通过人员信息的id获取人员对应的证书列表
         QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",idDto.getId());
+        wrapper.eq("staff_id", idDto.getId());
         List<MeterCertificate> meterCertificates = meterCertificateMapper.selectList(wrapper);
         meterStaff.setCertificateList(meterCertificates);
         return meterStaff;
@@ -109,7 +112,7 @@
 
     @Override
     public ReturnDTO deleteStaff(IdDTO idDto) {
-        if(meterStaffMapper.deleteById(idDto.getId())>0){
+        if (meterStaffMapper.deleteById(idDto.getId()) > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -119,11 +122,11 @@
     public Page<UserInfo> getUserList(String name, String deptId, Page<UserInfo> page) {
         QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(name), "name", name);
-        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id",deptId);
+        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id", deptId);
         Page<UserInfo> userInfoPage = userInfoMapper.selectPage(page, wrapper);
         userInfoPage.getRecords().forEach(user -> {
             Dept dept = deptMapper.selectById(user.getDeptId());
-            user.setDeptName(dept==null?"":dept.getFullName());
+            user.setDeptName(dept == null ? "" : dept.getFullName());
         });
         return userInfoPage;
     }
@@ -132,18 +135,18 @@
     @Transactional
     public ReturnDTO addStaffInfo(MeterStaff meterStaff) {
         QueryWrapper<MeterStaff> staffWrapper = new QueryWrapper<>();
-        staffWrapper.eq("account",meterStaff.getAccount());
+        staffWrapper.eq("account", meterStaff.getAccount());
         Long count = meterStaffMapper.selectCount(staffWrapper);
-        if(count!=0){
+        if (count != 0) {
             return ReturnUtil.failed("该用户已是计量人员");
         }
         long maxNo = meterStaffMapper.getMaxNo();
         meterStaff.setIsDel(0);
         String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo);
         meterStaff.setStaffNo(staffNo);
-        if(meterStaffMapper.insert(meterStaff)>0){
+        if (meterStaffMapper.insert(meterStaff) > 0) {
             Long id = meterStaff.getId();
-            meterStaff.getCertificateList().forEach(bean->{
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(id));
             });
             meterCertificateService.saveBatch(meterStaff.getCertificateList());
@@ -156,18 +159,18 @@
     public void exportStaffList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
         try {
             List<MeterStaff> meterStaffList;
-            if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+            if (!CollectionUtils.isEmpty(meterStaffRequest.getIds())) {
                 MeterStaffRequest request = new MeterStaffRequest();
                 request.setIds(meterStaffRequest.getIds());
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(request));
-            }else{
+            } else {
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
             }
-            meterStaffList.forEach(bean->{
-                bean.setSex(bean.getSex().equals("2")?"女":"男");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("0")?"已考核":"未考核");
+            meterStaffList.forEach(bean -> {
+                bean.setSex(bean.getSex().equals("2") ? "女" : "男");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("0") ? "已考核" : "未考核");
             });
-            iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList, ExportEnum.METER_STAFF.getSheetName());
+            iBaseExportService.exportExcel(response, MeterStaff.class, meterStaffList, ExportEnum.METER_STAFF.getSheetName());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -177,13 +180,13 @@
     @Transactional
     public ReturnDTO updateStaffInfo(MeterStaff meterStaff) {
         int updateFlag = meterStaffMapper.updateById(meterStaff);
-        if(updateFlag>0){
+        if (updateFlag > 0) {
             QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-            wrapper.eq("staff_id",meterStaff.getId());
-            meterStaff.getCertificateList().forEach(bean->{
+            wrapper.eq("staff_id", meterStaff.getId());
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(meterStaff.getId()));
             });
-            if(meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())){
+            if (meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())) {
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -203,89 +206,89 @@
         Map<String, List<Dict>> technologyJobDictMap = technologyJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<Dict>> administrationJobDictMap = administrationJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<ZTreeNode>> deptMap = deptList.stream().collect(Collectors.groupingBy(ZTreeNode::getName));
-        list.forEach(bean->{
+        list.forEach(bean -> {
             StringBuilder result = new StringBuilder();
             // 校验导入数据中的字典值是否存在
-            if(null == educationDictMap.get(bean.getEducation())){
+            if (null == educationDictMap.get(bean.getEducation())) {
                 result.append(BusinessExceptionEnum.EDUCATION_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == technologyJobDictMap.get(bean.getTechnologyJob())){
+            if (null == technologyJobDictMap.get(bean.getTechnologyJob())) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == administrationJobDictMap.get(bean.getAdministrationJob())){
+            if (null == administrationJobDictMap.get(bean.getAdministrationJob())) {
                 result.append(BusinessExceptionEnum.ADMINISTRATION_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == deptMap.get(bean.getDeptId())){
+            if (null == deptMap.get(bean.getDeptId())) {
                 result.append(BusinessExceptionEnum.DEPT_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的性别等信息是否正确
-            if(!(bean.getSex().equals("男")||bean.getSex().equals("女"))){
+            if (!(bean.getSex().equals("男") || bean.getSex().equals("女"))) {
                 result.append(BusinessExceptionEnum.SEX_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getMainExaminer().equals("是")||bean.getMainExaminer().equals("否"))){
+            if (!(bean.getMainExaminer().equals("是") || bean.getMainExaminer().equals("否"))) {
                 result.append(BusinessExceptionEnum.MAIN_EXAMINER_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getSpecialOperator().equals("是")||bean.getSpecialOperator().equals("否"))){
+            if (!(bean.getSpecialOperator().equals("是") || bean.getSpecialOperator().equals("否"))) {
                 result.append(BusinessExceptionEnum.SPECIAL_OPERATOR_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getTechnologyExam().equals("是")||bean.getTechnologyExam().equals("否"))){
+            if (!(bean.getTechnologyExam().equals("是") || bean.getTechnologyExam().equals("否"))) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_EXAM_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的日期格式是否规范
-            if(isDateFormat(bean.getValidDate())){
+            if (isDateFormat(bean.getValidDate())) {
                 result.append(BusinessExceptionEnum.VALID_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getWorkDate())){
+            if (isDateFormat(bean.getWorkDate())) {
                 result.append(BusinessExceptionEnum.WORK_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getBirthday())){
+            if (isDateFormat(bean.getBirthday())) {
                 result.append(BusinessExceptionEnum.BIRTHDAY_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getCertificateDate())){
+            if (isDateFormat(bean.getCertificateDate())) {
                 result.append(BusinessExceptionEnum.CERTIFICATE_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             bean.setResult(result.toString());
         });
-        if(checkResult.get()){
+        if (checkResult.get()) {
             // 校验通过
             AtomicLong maxNo = new AtomicLong(meterStaffMapper.getMaxNo());
-            list.forEach(bean->{
+            list.forEach(bean -> {
                 // 生成编号
                 String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo.get());
                 maxNo.set(Long.parseLong(staffNo.substring(4)));
                 bean.setStaffNo(staffNo);
                 // 获取id
-                Long id= IdWorker.getId();
+                Long id = IdWorker.getId();
                 bean.setId(id);
-                Long certificateId= IdWorker.getId();
+                Long certificateId = IdWorker.getId();
                 bean.setCertificateId(certificateId);
                 // 将数据的字典值替换
                 bean.setEducation(educationDictMap.get(bean.getEducation()).get(0).getCode());
                 bean.setTechnologyJob(technologyJobDictMap.get(bean.getTechnologyJob()).get(0).getCode());
                 bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode());
                 bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId());
-                bean.setSex(bean.getSex().equals("男")?"1":"2");
-                bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1");
-                bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1");
+                bean.setSex(bean.getSex().equals("男") ? "1" : "2");
+                bean.setMainExaminer(bean.getMainExaminer().equals("是") ? "0" : "1");
+                bean.setSpecialOperator(bean.getSpecialOperator().equals("是") ? "0" : "1");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("是") ? "0" : "1");
             });
             // 批量新增数据
             meterStaffMapper.addStaffList(list);
             meterCertificateMapper.addCertificateList(list);
             return ReturnUtil.success();
-        }else{
+        } else {
             // 校验不通过
             // 将处理后的数据导出成文件
             MultipartFile[] file = ExportUtils.exportMultipartFile(list, "checkResult", MeterStaffImport.class);
@@ -304,17 +307,17 @@
         try {
             DateUtil.parseDate(date);
             return false;
-        }catch (Exception e){
+        } catch (Exception e) {
             return true;
         }
     }
 
 
-    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList){
-        meterStaffList.forEach(bean->{
-            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,bean.getEducation()));
-            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,bean.getTechnologyJob()));
-            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,bean.getAdministrationJob()));
+    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList) {
+        meterStaffList.forEach(bean -> {
+            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
+            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
+            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
             bean.setDeptId(deptMapper.selectById(bean.getDeptId()).getFullName());
         });
         return meterStaffList;
@@ -334,11 +337,31 @@
     @Transactional
     public ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list) {
         QueryWrapper<MeterTrainStaff> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",list.get(0).getStaffId());
-        if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){
+        wrapper.eq("staff_id", list.get(0).getStaffId());
+        if (trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        AuthUser authUser = ShiroKit.getUser();
+        MeterStaff meterStaff = getMeterStaffInfo(authUser);
+        HashMap<String, Integer> map = new HashMap<>();
+        if (Objects.isNull(meterStaff)) {
+            map.put("isMeterStaff", 0);
+        }else {
+            map.put("isMeterStaff", 1);
+        }
+        return ReturnUtil.success(map);
+    }
+
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return meterStaffMapper.selectOne(wrapper);
+    }
+
 }
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
index 8d07e18..f422426 100644
--- 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
@@ -1,10 +1,25 @@
 package com.casic.missiles.service.Impl.workbench;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
 import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -16,5 +31,59 @@
  */
 @Service
 public class WorkbenchApprovalMessageServiceImpl extends ServiceImpl<WorkbenchApprovalMessageMapper, WorkbenchApprovalMessage> implements IWorkbenchApprovalMessageService {
+    @Autowired
+    private IBaseApprovalService baseApprovalService;
 
+    @Autowired
+    private WorkbenchApprovalMessageMapper approvalMessageMapper;
+
+    @Override
+    public List<WorkbenchApprovalMessage> listPage(Page<WorkbenchApprovalMessage> page, ApprovalMessageRequest approvalMessageRequest) {
+        //所有业务待审批列表封装为消息
+        //计量管理：计量文件、培训计划、溯源供方
+        //测量设备：标准装置：更换、暂停、撤销、恢复、复查；
+        //         状态管理：闲置、封存、启封、报废、处置，维护：检修、保养，领用，借用这些都在状态管理里，对应枚举：EquipmentApplyTypeEnum
+        //业务管理：分包方资格、项目申请、项目验收，现场检测
+        // TODO: 2023/4/21 多线程优化查询，分页
+        List<WorkbenchApprovalMessage> resultList = new ArrayList<>();
+        if(Objects.nonNull(approvalMessageRequest.getStatus()) && 1 == approvalMessageRequest.getStatus()){
+            for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) {
+                if(StringUtils.isNotEmpty(approvalMessageRequest.getMessageSourceModule()) &&
+                        applyFromIdEnum.getSource().equals(approvalMessageRequest.getMessageSourceModule())){
+                    continue;
+                }
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode());
+                if(CollectionUtils.isEmpty(toBeApprovedList)){
+                    continue;
+                }
+                toBeApprovedList.forEach(a -> {
+                    WorkbenchApprovalMessage message = new WorkbenchApprovalMessage();
+                    message.setCreateTime(a.getCreateTime());
+                    message.setFormId(applyFromIdEnum.getCode());
+                    message.setMessageSourceModule(applyFromIdEnum.getSource());
+                    message.setMessageTitle("待审批通知");
+                    message.setMessageContent(applyFromIdEnum.getValue());
+                    message.setStatus(0);//待审批消息都是未读/未处理，处理后就不会在这个列表显示
+                    resultList.add(message);
+                });
+            }
+        }
+        //通知消息
+        QueryWrapper<WorkbenchApprovalMessage> wrapper = new QueryWrapper<>();
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getNoticeId()), "notice_id", approvalMessageRequest.getNoticeId());
+        wrapper.eq(StringUtils.isNotBlank(approvalMessageRequest.getMessageSourceModule()), "message_source_module", approvalMessageRequest.getMessageSourceModule());
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getStatus()), "status", approvalMessageRequest.getStatus());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getStartTime()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getEndTime()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getEndTime());
+        List<WorkbenchApprovalMessage> list = approvalMessageMapper.selectList(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            resultList.addAll(list);
+        }
+        //按时间排序组装
+        List<WorkbenchApprovalMessage> finalList = resultList.stream().sorted(Comparator.comparing(WorkbenchApprovalMessage::getCreateTime).reversed()).collect(Collectors.toList());
+
+        return finalList;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
index cf83a54..c131ba2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
@@ -12,6 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -43,4 +44,6 @@
     Page<MeterTrainStaff> staffCultivateLog(Page<MeterTrainStaff> page, IdDTO idDto);
 
     ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list);
+
+    ReturnDTO<Map<String, Integer>> isMeterStaff();
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
index 1e3e4ac..700b299 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessOutsourcerController.java
@@ -25,8 +25,8 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,7 +70,7 @@
     @ApiOperation("分包方档案导出")
     @PostMapping("/listExport")
     @ResponseBody
-    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws IOException {
+    public void export(@RequestBody @Valid OutsourcerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
@@ -80,6 +80,9 @@
         } else {
             list = outsourcerInfoService.list(request);
         }
+        for (BusinessOutsourcerInfo record : list) {
+            DictCodeUtils.convertDictCodeToName(record);
+        }
         super.exportExcel(BusinessOutsourcerInfo.class, list, ExportEnum.OUTSOURCER_EXPORT.getSheetName());
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
index fe7a634..0d3cf31 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java
@@ -10,10 +10,10 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.meter.MeterStaffImport;
 import com.casic.missiles.dto.meter.MeterStaffRequest;
-import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.model.meter.MeterStaff;
 import com.casic.missiles.model.meter.MeterTrainStaff;
 import com.casic.missiles.model.system.UserInfo;
+import com.casic.missiles.service.listeners.CommonExcelListener;
 import com.casic.missiles.service.meter.MeterStaffService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +25,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -179,4 +180,14 @@
         return meterStaffService.updateStaffCultivateLog(list);
     }
 
+    /**
+     * 是否计量人员
+     */
+    @ApiOperation("是否计量人员")
+    @GetMapping("/isMeterStaff")
+    @ResponseBody
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        return meterStaffService.isMeterStaff();
+    }
+
 }
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
index 9f9a6d8..9c5a7e6 100644
--- 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
@@ -1,7 +1,19 @@
 package com.casic.missiles.controller.workbench;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -13,6 +25,19 @@
  */
 @RestController
 @RequestMapping("/workbench/approvalMessage")
-public class WorkbenchApprovalMessageController {
-    //审批待办=用户待审批列表+审批结果通知（workbench_approval_message表）
+public class WorkbenchApprovalMessageController extends ExportController {
+    @Autowired
+    private IWorkbenchApprovalMessageService approvalMessageService;
+
+    /**
+     * 审批提醒列表
+     * 用户待审批列表、审批结果通知（workbench_approval_message表）
+     */
+    @ApiOperation("审批提醒列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<List<WorkbenchApprovalMessage>> approvalMessageList(@RequestBody @Valid ApprovalMessageRequest approvalMessageRequest) {
+        Page<WorkbenchApprovalMessage> page = PageFactory.defaultPage();
+        return ReturnUtil.success(approvalMessageService.listPage(page, approvalMessageRequest));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
index 11ddc39..7614330 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/workbench/WorkbenchRemindMessageController.java
@@ -41,9 +41,10 @@
     /**
      * 工作提醒列表
      * 工作提醒=4种到期提醒（workbench_remind_message表）
+     * 设备证书到期提醒、装置到期提醒、人员证书到期提醒、检定超期提醒
      */
     @ApiOperation("工作提醒列表")
-    @PostMapping("/list")
+    @PostMapping("/listPage")
     @ResponseBody
     public ReturnDTO<PageInfoBT<WorkbenchRemindMessage>> remindMessageList(@RequestBody @Valid RemindMessageRequest remindMessageRequest) throws Exception {
         Page<WorkbenchRemindMessage> page = PageFactory.defaultPage();
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
index 88f80df..290618d 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java
@@ -27,7 +27,7 @@
      */
     public static final String SCRAP_APPLY = "6";
     /**
-     * 设备报废申请
+     * 设备处置申请
      */
     public static final String HANDLE_APPLY = "10";
     /**
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
index 46e86c6..8c3d580 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java
@@ -24,22 +24,22 @@
     SITE_EXECUTIVE_INFO_CHECK(SITE_EXECUTIVE_INFO_BEAN_NAME, ""),
     ACTION_STATUS_MAP(new HashMap<String, AwareActionStatusEnum>() {
         {
-            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL, EQUIPMENT_APPLY_USE);
-            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL, EQUIPMENT_APPLY_STOP);
-            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL, EQUIPMENT_APPLY_REVOKE);
-            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL, EQUIPMENT_SUPPORT_STATUS);
-            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL, DEVICE_MANAGING_IDLE);
-            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL, DEVICE_MANAGING_SEALED);
-            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL, DEVICE_MANAGING_USE);
-            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL, DEVICE_MANAGING_SCRAP);
-            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL, DEVICE_MANAGING_MANAGEMENT);
-            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL, DEVICE_LEASE_CONSUMING);           // 设备领用申请
-            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL, DEVICE_LEASE_BORROWED);               // 设备借用申请
-            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL, CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
-            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL, CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL, OUTSOURCE_PROJECT_APPLY);
-            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL, OUTSOURCE_PROJECT_CHECK);
-            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL, SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
+            put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE);
+            put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP);
+            put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE);
+            put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS);
+            put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE);
+            put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED);
+            put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE);
+            put(ApplyFromIdEnum.DEVICE_SCRAP_APPROVAL.getCode(), DEVICE_MANAGING_SCRAP);
+            put(ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL.getCode(), DEVICE_MANAGING_MANAGEMENT);
+            put(ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode(), DEVICE_LEASE_CONSUMING);           // 设备领用申请
+            put(ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode(), DEVICE_LEASE_BORROWED);               // 设备借用申请
+            put(ApplyFromIdEnum.CERTIFICATE_PRINT_APPROVAL.getCode(), CERTIFICATE_PRINT_STATUS);           //证书打印审批通过状态回填
+            put(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode(), CERTIFICATE_REPORT_STATUS);           //证书报告审批通过状态回填
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_APPLY_APPROVAL.getCode(), OUTSOURCE_PROJECT_APPLY);
+            put(ApplyFromIdEnum.OUTSOURCE_PROJECT_CHECK_APPROVAL.getCode(), OUTSOURCE_PROJECT_CHECK);
+            put(ApplyFromIdEnum.SITE_EXECUTIVE_INFO_APPROVAL.getCode(), SITE_EXECUTIVE_INFO_CHECK); //外场检测审批
         }
     });
     String actionBeanName;
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
index 7e725aa..fc2ad73 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java
@@ -1,28 +1,50 @@
 package com.casic.missiles.enums.system;
 
-public interface ApplyFromIdEnum {
-    String FILE_APPROVAL = "jlglwjsp"; // 文件审批;
-    String TRAIN_APPROVAL = "jlglpxjhsp"; // 培训计划审批
-    String SUPPLIER_APPROVAL = "jlglsygfsp"; // 溯源供方审批
-    String STANDARD_CHANGE_APPROVAL = "sbglbzzzghsq"; // 标准装置更换申请
-    String STANDARD_PAUSE_APPROVAL = "sbglbzzzztsq"; // 标准装置暂停申请
-    String STANDARD_REVERT_APPROVAL = "sbglbzzzcxsq"; // 标准装置撤销申请
-    String STANDARD_RESUME_APPROVAL = "sbglbzzzhfsq"; // 标准装置恢复申请
-    String STANDARD_CHECK_APPROVAL = "sbglbzzzfcsq"; // 标准装置复查申请
-    String DEVICE_UNUSED_APPROVAL = "sbglsbxzsq"; // 设备闲置申请
-    String DEVICE_SEALED_APPROVAL = "sbglsbfcsq"; // 设备封存申请
-    String DEVICE_UNSEALED_APPROVAL = "sbglsbqfsq"; // 设备启封申请
-    String DEVICE_SCRAP_APPROVAL = "sbglsbbfsq"; // 设备报废申请
-    String DEVICE_HANDLE_APPROVAL = "sbglsbczsq"; // 设备处置申请
-    String DEVICE_CONSUMING_APPROVAL = "clsblysp"; // 设备领用申请
-    String DEVICE_BORROW_APPROVAL = "clsbjysp"; // 设备借用申请
-    String DEVICE_FIX_APPROVAL = "sbglsbjxsq"; // 设备检修申请
-    String DEVICE_FIX_ACCEPTANCE = "sbglsbjxbyysd"; // 设备检修保养验收单
-    String CERTIFICATE_PRINT_APPROVAL = "ywglzsdy"; // 证书打印通过
-    String CERTIFICATE_REPORT_APPROVAL = "ywglzsbg"; // 证书报告通过
-    String OUTSOURCER_APPROVAL = "ywglfbfzg"; // 分包方资格
-    String OUTSOURCE_PROJECT_APPLY_APPROVAL = "ywglfbxmsq"; // 分包项目申请
-    String OUTSOURCE_PROJECT_CHECK_APPROVAL = "ywglfbxmys"; // 分包项目验收
-    String AGREEMENT_APPROVAL = "cwczht"; // 合同
-    String SITE_EXECUTIVE_INFO_APPROVAL = "ywglxcjc"; // 外出检测审批
+public enum ApplyFromIdEnum {
+    FILE_APPROVAL("jlglwjsp", "4", "文件审批"),
+    TRAIN_APPROVAL("jlglpxjhsp", "4", "培训计划审批"),
+    STANDARD_EQUIPMENT("jlglsygfsp", "4", "溯源供方审批"),
+    STANDARD_CHANGE_APPROVAL("sbglbzzzghsq", "3", "标准装置更换申请"),
+    STANDARD_PAUSE_APPROVAL("sbglbzzzztsq", "3", "标准装置暂停申请"),
+    STANDARD_REVERT_APPROVAL("sbglbzzzcxsq", "3", "标准装置撤销申请"),
+    STANDARD_RESUME_APPROVAL("sbglbzzzhfsq", "3", "标准装置恢复申请"),
+    STANDARD_CHECK_APPROVAL("sbglbzzzfcsq", "3", "标准装置复查申请"),
+    DEVICE_UNUSED_APPROVAL("sbglsbxzsq", "3", "设备闲置申请"),
+    DEVICE_SEALED_APPROVAL("sbglsbfcsq", "3", "设备封存申请"),
+    DEVICE_UNSEALED_APPROVAL("sbglsbqfsq", "3", "设备启封申请"),
+    DEVICE_SCRAP_APPROVAL("sbglsbbfsq", "3", "设备报废申请"),
+    DEVICE_HANDLE_APPROVAL("sbglsbczsq", "3", "设备处置申请"),
+    DEVICE_CONSUMING_APPROVAL("clsblysp", "3", "设备领用申请"),
+    DEVICE_BORROW_APPROVAL("clsbjysp", "3", "设备借用申请"),
+    DEVICE_FIX_APPROVAL("sbglsbjxsq", "3", "设备检修申请"),
+    DEVICE_FIX_ACCEPTANCE("sbglsbjxbyysd", "3", "设备检修保养验收单"),
+    CERTIFICATE_PRINT_APPROVAL("ywglzsdy", "1", "证书打印通过"),
+    CERTIFICATE_REPORT_APPROVAL("ywglzsbg", "1", "证书报告通过"),
+    OUTSOURCER_APPROVAL("ywglfbfzg", "1", "分包方资格"),
+    OUTSOURCE_PROJECT_APPLY_APPROVAL("ywglfbxmsq", "1", "分包项目申请"),
+    OUTSOURCE_PROJECT_CHECK_APPROVAL("ywglfbxmys", "1", "分包项目验收"),
+    AGREEMENT_APPROVAL("cwczht", "2", "合同"),
+    SITE_EXECUTIVE_INFO_APPROVAL("ywglxcjc", "1", "现场检测审批");
+
+    private String code;
+    private String source;//MessageSourceModuleEnum类code,工作台审批消息提醒接口使用
+    private String value;
+
+    ApplyFromIdEnum(String code, String source, String value) {
+        this.code = code;
+        this.source = source;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getValue() {
+        return value;
+    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
new file mode 100644
index 0000000..ff651f8
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageSourceModuleEnum.java
@@ -0,0 +1,31 @@
+package com.casic.missiles.enums.workbench;
+
+/**
+ * 标识消息来源模块，消息主题
+ */
+public enum MessageSourceModuleEnum {
+
+    BUSINESS("1", "业务管理"),
+    FINANCE("2", "财务产值"),
+    EQUIPMENT("3", "测量设备"),
+    METER("4", "计量管理"),
+    QUALITY_ASSURANCE("5", "质量管理"),
+    CUSTOMER("6", "客户资源"),
+    SYSTEM("7", "系统设置");
+
+    private String code;
+    private String value;
+
+    MessageSourceModuleEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
index bb46af8..5fa04e2 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/workbench/MessageTypeEnum.java
@@ -5,7 +5,9 @@
     METER_CERTIFICATE("1", "计量人员证书到期提醒"),
     MEASURING_EQUIPMENT("2", "测量设备到期提醒"),
     STANDARD_EQUIPMENT("3", "标准装置到期提醒"),
-    OVERTIME_MEASURE("4", "超出检定时间催办提醒");
+    OVERTIME_MEASURE("4", "超出检定时间催办提醒"),
+    TO_APPROVAL("5", "待审批"),
+    APPROVAL_RESULT_NOTICE("6", "审批结果通知");
 
     private String code;
     private String value;
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
index a31eede..a40e75a 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchApprovalMessageMapper.xml
@@ -9,6 +9,8 @@
         <result column="notice_dept_id" property="noticeDeptId" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
+        <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
         <result column="form_id" property="formId" />
         <result column="status" property="status" />
         <result column="create_time" property="createTime" />
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, notice_id, notice_dept_id, message_title, message_content, form_id, status, create_time, update_time
+        id, notice_id, notice_dept_id, message_title, message_content, message_type, message_source_module, form_id, status, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
index 8bb7bb6..94e63bc 100644
--- a/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/workbench/WorkbenchRemindMessageMapper.xml
@@ -10,6 +10,8 @@
         <result column="business_id" property="businessId" />
         <result column="business_code" property="businessCode" />
         <result column="message_type" property="messageType" />
+        <result column="message_source_module" property="messageSourceModule" />
+        <result column="message_topic" property="messageTopic" />
         <result column="message_title" property="messageTitle" />
         <result column="message_content" property="messageContent" />
         <result column="status" property="status" />
@@ -21,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_title, message_content, status, create_user, create_user_name, create_time, update_time
+        id, remind_id, remind_dept_id, business_id, business_code, message_type, message_source_module, message_topic, message_title, message_content, status, create_user, create_user_name, create_time, update_time
     </sql>
 
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 003fa11..9fb7152 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -123,6 +123,8 @@
      * 工作台
      */
     String MESSAGE_TYPE = "messageType";
+
+    String MESSAGE_SOURCE_MODULE = "messageSourceModule";
     // APP全局查询类型
     String APP_AGGREGATE_QUERY_TYPE = "appAggregateQueryType";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
index 1ef30be..79b030b 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ToBeApprovedDTO.java
@@ -12,4 +12,6 @@
     private String businessKey;
     private String taskId;
     private Integer decisionItem;
+    //任务创建时间，工作台审批提醒使用
+    private String createTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
new file mode 100644
index 0000000..2ede5a2
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/ApprovalMessageRequest.java
@@ -0,0 +1,35 @@
+package com.casic.missiles.dto.workbench;
+
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2023/4/21 10:25
+ */
+@ApiModel
+@Data
+public class ApprovalMessageRequest {
+    @ApiModelProperty(value = "通知的用户id", dataType = "Long")
+    private Long noticeId;
+
+    @ApiModelProperty(value = "通知的用户部门id", dataType = "Long")
+    private Long noticeDeptId;
+
+    @ApiModelProperty(value = "通知开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "通知结束时间", dataType = "String")
+    private String endTime;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "已读1未读0", dataType = "Integer")
+    private Integer status;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
index 053ba74..b3d06f7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/workbench/RemindMessageRequest.java
@@ -21,7 +21,7 @@
     @ApiModelProperty(value = "消息提醒开始时间", dataType = "String")
     private String startTime;
 
-    @ApiModelProperty(value = "消息提醒结束", dataType = "String")
+    @ApiModelProperty(value = "消息提醒结束时间", dataType = "String")
     private String endTime;
 
     @ApiModelProperty(value = "消息提醒的业务类型（字典code）", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
index 4c37d69..c16b71d 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOutsourcerInfo.java
@@ -71,6 +71,7 @@
     /**
      * 分包方公司规模-字典
      */
+    @DictCodeField(message = "分包方公司规模不合法", cacheName = MeterDictCode.COMPANY_SCALE)
     @ApiModelProperty(value = "公司规模-字典code", dataType = "String")
     @NotBlank(message = "公司规模不能为空")
     @TableField("outsourcer_size")
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
index 452feeb..4be7b4a 100644
--- 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,7 +40,7 @@
     private Long noticeDeptId;
 
     /**
-     * 消息主题(标题，冗余)
+     * 消息标题
      */
     @TableField("message_title")
     private String messageTitle;
@@ -48,6 +51,24 @@
     @TableField("message_content")
     private String messageContent;
 
+    @DictCodeField(message = "消息的业务类型不合法", cacheName = MeterDictCode.MESSAGE_TYPE)
+    @ApiModelProperty(value = "消息的业务类型（字典code）", dataType = "String")
+    @TableField("message_type")
+    private String messageType;
+
+    @ApiModelProperty(value = "消息的业务类型（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageTypeName;
+
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
+
     /**
      * 前端表单id（用于区分业务类型及页面跳转）
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
index fad3f38..9278622 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java
@@ -51,13 +51,13 @@
     @TableField("business_id")
     private Long businessId;
 
-
     /**
      * 消息提醒的业务关联表id
      */
     @ApiModelProperty(value = "关联表业务主键", dataType = "Long")
     @TableField("relation_business_id")
     private Long relationBusinessId;
+
     /**
      * 消息提醒的业务内容编码
      */
@@ -77,6 +77,14 @@
     @TableField(exist = false)
     private String messageTypeName;
 
+    @DictCodeField(message = "来源模块不合法", cacheName = MeterDictCode.MESSAGE_SOURCE_MODULE)
+    @ApiModelProperty(value = "来源模块（字典code）", dataType = "String")
+    @TableField("message_source_module")
+    private String messageSourceModule;
+
+    @ApiModelProperty(value = "来源模块（字典value）", dataType = "String")
+    @TableField(exist = false)
+    private String messageSourceModuleName;
 
     /**
      * 消息主题
@@ -84,6 +92,7 @@
     @ApiModelProperty(value = "消息主题", dataType = "String")
     @TableField("message_topic")
     private String messageTopic;
+
     /**
      * 消息主题（冗余）
      */
@@ -133,12 +142,14 @@
     @TableField("update_time")
     private String updateTime;
 
-    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageTitle, String messageContent, Integer status, Long createUser, String createUserName) {
+    public WorkbenchRemindMessage(Long remindId, Long remindDeptId, Long businessId, String businessCode, String messageType, String messageSourceModule, String messageTitle, String messageTopic, String messageContent, Integer status, Long createUser, String createUserName) {
         this.remindId = remindId;
         this.remindDeptId = remindDeptId;
         this.businessId = businessId;
         this.businessCode = businessCode;
         this.messageType = messageType;
+        this.messageSourceModule = messageSourceModule;
+        this.messageTopic = messageTopic;
         this.messageTitle = messageTitle;
         this.messageContent = messageContent;
         this.status = status;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
index d78634b..26dded8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -245,6 +246,7 @@
             toBeApprovedDTO.setTaskId(task.getId());
             toBeApprovedDTO.setBusinessKey(historicProcessInstance.getBusinessKey());
             toBeApprovedDTO.setDecisionItem(decisionItem); //设置可选决策项
+            toBeApprovedDTO.setCreateTime(DateUtil.format(task.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             toBeApprovedDTOs.add(toBeApprovedDTO);
         }
 
@@ -417,8 +419,8 @@
         historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-//                    .deleted() //拒绝的审批流程要执行删除操作，也要设置业务状态，所以使用下行的状态可满足拒绝的查询
-                .processInstanceBusinessStatus(failStatus) //不加deleted查询的是所有的
+                .notDeleted()//驳回的是没有被删除的
+                .processInstanceBusinessStatus(failStatus)
                 .orderByProcessInstanceStartTime().desc()
                 .list();
         return historicProcessInstances;
@@ -426,14 +428,25 @@
 
     private List<HistoricProcessInstance> getFailedProcessInstancesForStartedAndAssignee(SystemFlowForm flowForm, AuthUser user, String failStatus) {
         //根据业务状态、流程定义、登录用户id查询该业务未通过的流程实例（作为发起者）
-        List<HistoricProcessInstance> historicProcessInstances;
-        historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
-                .processDefinitionKey(flowForm.getProcDefId())
+        List<HistoricProcessInstance> historicProcessInstances = new ArrayList<>();
+        if(ApprovalStatusEnum.FAILED.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
 //                    .deploymentId(flowForm.getDeployId())
-                .startedBy(String.valueOf(user.getId()))
-                .processInstanceBusinessStatus(failStatus)
-                .orderByProcessInstanceStartTime().desc()
-                .list();
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }else if(ApprovalStatusEnum.FAILED_REJECT.equals(failStatus)){
+            historicProcessInstances = historyService.createHistoricProcessInstanceQuery()
+                    .processDefinitionKey(flowForm.getProcDefId())
+//                    .deploymentId(flowForm.getDeployId())
+                    .notDeleted()//驳回的是没有被删除的
+                    .startedBy(String.valueOf(user.getId()))
+                    .processInstanceBusinessStatus(failStatus)
+                    .orderByProcessInstanceStartTime().desc()
+                    .list();
+        }
         //根据业务状态、流程定义、登录用户id获取该业务的未通过的流程实例的审批者已完成任务（作为审批者）
         List<HistoricTaskInstance> tasks = historyService.createHistoricTaskInstanceQuery()
                 .processDefinitionKey(flowForm.getProcDefId())
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
index 787780a..f977cb3 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java
@@ -310,7 +310,7 @@
                     certificateMonitorResponse.getFinishedTime() : "");
 
             //设置退回次数
-            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL);
+            List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(ApplyFromIdEnum.CERTIFICATE_REPORT_APPROVAL.getCode());
 
             rejectBusinessKey.forEach(obj -> {
                 if (obj.equals(certificateMonitorResponse.getCertificationId().toString())) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
index 91fc765..92c9ba8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessBoardServiceImpl.java
@@ -234,7 +234,7 @@
         List<BoardDeptComprehensiveResponse> deptPassDeviceList = boardMapper.selectDeptPassDevices(request);
         //维修设备数量，使用设备保养验收单中申请通过的就是设备维修记录（设备申请类型为9是设备检修保养验收）
         //只有管理员登录查询会获取所有通过的设备维修记录
-        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE);
+        List<String> businessKeys = baseApprovalService.getPassedList(ApplyFromIdEnum.DEVICE_FIX_ACCEPTANCE.getCode());
         List<BoardDeptComprehensiveResponse> deptRepairDeviceList = boardMapper.selectDeptRepairDevices(request, businessKeys);
 
         //结果组装
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d358288..a94cbb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.business.MeasureTypeEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
 import com.casic.missiles.enums.sample.SampleStatusEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessCertificateReportMapper;
@@ -312,6 +313,8 @@
         WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage();
         remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId());
         remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode());
+        remindMessage.setMessageSourceModule(MessageSourceModuleEnum.BUSINESS.getCode());
+        remindMessage.setMessageTitle(MessageTypeEnum.OVERTIME_MEASURE.getValue());
         //检测人不为空，且检测状态不为待分配消息催办到我的检测
         if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) {
             MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index 944ec0f..bdb57c7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -20,6 +20,7 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.enums.meter.MeterDictEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.MeterFixedAssetsMapper;
@@ -426,7 +427,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index 0176343..0e6b3a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -61,17 +61,17 @@
         List<HashMap<String,Object>> standardStateList = new ArrayList<>();
         List<HashMap<String,Object>> equipmentApplyList = new ArrayList<>();
         // 测量设备闲置
-        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL));
+        measureStateList.add(getApplyCount("闲置设备", ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode()));
         // 测量设备封存
-        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL));
+        measureStateList.add(getApplyCount("封存设备", ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode()));
         // 标准装置暂停
-        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL));
+        standardStateList.add(getApplyCount("暂停装置", ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode()));
         // 标准装置撤销
-        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL));
+        standardStateList.add(getApplyCount("撤销装置", ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode()));
         // 设备借用
-        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备借用", ApplyFromIdEnum.DEVICE_BORROW_APPROVAL.getCode()));
         // 设备领用
-        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL));
+        equipmentApplyList.add(getApplyCount("本月设备领用", ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL.getCode()));
         // 测量设备总数
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.eq("asset_type", "1");
@@ -171,7 +171,7 @@
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
         // 待检定数量 通过提出设备检修申请获取本月申请通过的业务id
-        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
+        List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL.getCode()));
         if(businessKeys.size()==0){
             response.setVerifiedNum(0);
             response.setOvertimeNum(0);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
index c20feb0..0267df7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterCertificateServiceImpl.java
@@ -23,6 +23,7 @@
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.meter.MeterDictEnum;
 import com.casic.missiles.enums.meter.MeterRoleTypeEnum;
+import com.casic.missiles.enums.workbench.MessageSourceModuleEnum;
 import com.casic.missiles.enums.workbench.MessageTypeEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.meter.MeterCertificateMapper;
@@ -179,7 +180,7 @@
         Assert.isFalse(Objects.isNull(user), () -> {
             throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
         });
-        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
+        WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(userInfo.getId(),Long.parseLong(userInfo.getDeptId()),idDto.getId(),meterCertificate.getCertificateNo(), MessageTypeEnum.METER_CERTIFICATE.getCode(),MessageSourceModuleEnum.METER.getCode(),MessageTypeEnum.METER_CERTIFICATE.getValue(),MessageTypeEnum.METER_CERTIFICATE.getValue(),meterCertificate.getCertificateName(),0,user.getId(),user.getName());
         if(messageMapper.insert(remindMessage)>0){
             // 新增到消息列表后向用户推送消息
             webSocket.sendOneMessage(String.valueOf(userInfo.getId()),JSONObject.toJSONString(remindMessage));
@@ -214,7 +215,9 @@
             // 补充业务数据
             for (WorkbenchRemindMessage message : messageList) {
                 message.setMessageType(MessageTypeEnum.METER_CERTIFICATE.getCode());
+                message.setMessageSourceModule(MessageSourceModuleEnum.METER.getCode());
                 message.setMessageTitle(MessageTypeEnum.METER_CERTIFICATE.getValue());
+                message.setMessageTopic(MessageTypeEnum.METER_CERTIFICATE.getValue());
                 message.setStatus(0);
                 message.setCreateUser(Long.valueOf(MeterRoleTypeEnum.ADMIN.getCode()));
                 message.setCreateUserName(MeterRoleTypeEnum.ADMIN.getValue());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
index f79bb8a..d62fa42 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java
@@ -7,7 +7,9 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.service.IBaseExportService;
+import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.node.ZTreeNode;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
@@ -43,8 +45,10 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -53,7 +57,6 @@
  * <p>
  * 计量管理-计量人员-计量人员表 服务实现类
  * </p>
- *
  */
 @Service("MeterStaffService")
 public class MeterStaffServiceImpl extends ServiceImpl<MeterStaffMapper, MeterStaff> implements MeterStaffService {
@@ -89,7 +92,7 @@
     private IMeterTrainStaffService trainStaffService;
 
     @Override
-    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page,MeterStaffRequest meterStaffRequest) {
+    public Page<MeterStaff> selectStaffList(Page<MeterStaff> page, MeterStaffRequest meterStaffRequest) {
         Page<MeterStaff> meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest);
         meterStaffPage.setRecords(supplementList(meterStaffPage.getRecords()));
         return meterStaffPage;
@@ -101,7 +104,7 @@
         MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(String.valueOf(idDto.getId()));
         // 通过人员信息的id获取人员对应的证书列表
         QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",idDto.getId());
+        wrapper.eq("staff_id", idDto.getId());
         List<MeterCertificate> meterCertificates = meterCertificateMapper.selectList(wrapper);
         meterStaff.setCertificateList(meterCertificates);
         return meterStaff;
@@ -109,7 +112,7 @@
 
     @Override
     public ReturnDTO deleteStaff(IdDTO idDto) {
-        if(meterStaffMapper.deleteById(idDto.getId())>0){
+        if (meterStaffMapper.deleteById(idDto.getId()) > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -119,11 +122,11 @@
     public Page<UserInfo> getUserList(String name, String deptId, Page<UserInfo> page) {
         QueryWrapper<UserInfo> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(name), "name", name);
-        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id",deptId);
+        wrapper.eq(StringUtils.isNotBlank(deptId), "dept_id", deptId);
         Page<UserInfo> userInfoPage = userInfoMapper.selectPage(page, wrapper);
         userInfoPage.getRecords().forEach(user -> {
             Dept dept = deptMapper.selectById(user.getDeptId());
-            user.setDeptName(dept==null?"":dept.getFullName());
+            user.setDeptName(dept == null ? "" : dept.getFullName());
         });
         return userInfoPage;
     }
@@ -132,18 +135,18 @@
     @Transactional
     public ReturnDTO addStaffInfo(MeterStaff meterStaff) {
         QueryWrapper<MeterStaff> staffWrapper = new QueryWrapper<>();
-        staffWrapper.eq("account",meterStaff.getAccount());
+        staffWrapper.eq("account", meterStaff.getAccount());
         Long count = meterStaffMapper.selectCount(staffWrapper);
-        if(count!=0){
+        if (count != 0) {
             return ReturnUtil.failed("该用户已是计量人员");
         }
         long maxNo = meterStaffMapper.getMaxNo();
         meterStaff.setIsDel(0);
         String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo);
         meterStaff.setStaffNo(staffNo);
-        if(meterStaffMapper.insert(meterStaff)>0){
+        if (meterStaffMapper.insert(meterStaff) > 0) {
             Long id = meterStaff.getId();
-            meterStaff.getCertificateList().forEach(bean->{
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(id));
             });
             meterCertificateService.saveBatch(meterStaff.getCertificateList());
@@ -156,18 +159,18 @@
     public void exportStaffList(MeterStaffRequest meterStaffRequest, HttpServletResponse response) {
         try {
             List<MeterStaff> meterStaffList;
-            if(!CollectionUtils.isEmpty(meterStaffRequest.getIds())){
+            if (!CollectionUtils.isEmpty(meterStaffRequest.getIds())) {
                 MeterStaffRequest request = new MeterStaffRequest();
                 request.setIds(meterStaffRequest.getIds());
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(request));
-            }else{
+            } else {
                 meterStaffList = supplementList(meterStaffMapper.selectStaffList(meterStaffRequest));
             }
-            meterStaffList.forEach(bean->{
-                bean.setSex(bean.getSex().equals("2")?"女":"男");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("0")?"已考核":"未考核");
+            meterStaffList.forEach(bean -> {
+                bean.setSex(bean.getSex().equals("2") ? "女" : "男");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("0") ? "已考核" : "未考核");
             });
-            iBaseExportService.exportExcel(response, MeterStaff.class,meterStaffList, ExportEnum.METER_STAFF.getSheetName());
+            iBaseExportService.exportExcel(response, MeterStaff.class, meterStaffList, ExportEnum.METER_STAFF.getSheetName());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -177,13 +180,13 @@
     @Transactional
     public ReturnDTO updateStaffInfo(MeterStaff meterStaff) {
         int updateFlag = meterStaffMapper.updateById(meterStaff);
-        if(updateFlag>0){
+        if (updateFlag > 0) {
             QueryWrapper<MeterCertificate> wrapper = new QueryWrapper<>();
-            wrapper.eq("staff_id",meterStaff.getId());
-            meterStaff.getCertificateList().forEach(bean->{
+            wrapper.eq("staff_id", meterStaff.getId());
+            meterStaff.getCertificateList().forEach(bean -> {
                 bean.setStaffId(String.valueOf(meterStaff.getId()));
             });
-            if(meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())){
+            if (meterCertificateService.remove(wrapper) && meterCertificateService.saveBatch(meterStaff.getCertificateList())) {
                 return ReturnUtil.success();
             }
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -203,89 +206,89 @@
         Map<String, List<Dict>> technologyJobDictMap = technologyJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<Dict>> administrationJobDictMap = administrationJobDict.stream().collect(Collectors.groupingBy(Dict::getName));
         Map<String, List<ZTreeNode>> deptMap = deptList.stream().collect(Collectors.groupingBy(ZTreeNode::getName));
-        list.forEach(bean->{
+        list.forEach(bean -> {
             StringBuilder result = new StringBuilder();
             // 校验导入数据中的字典值是否存在
-            if(null == educationDictMap.get(bean.getEducation())){
+            if (null == educationDictMap.get(bean.getEducation())) {
                 result.append(BusinessExceptionEnum.EDUCATION_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == technologyJobDictMap.get(bean.getTechnologyJob())){
+            if (null == technologyJobDictMap.get(bean.getTechnologyJob())) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == administrationJobDictMap.get(bean.getAdministrationJob())){
+            if (null == administrationJobDictMap.get(bean.getAdministrationJob())) {
                 result.append(BusinessExceptionEnum.ADMINISTRATION_JOB_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
-            if(null == deptMap.get(bean.getDeptId())){
+            if (null == deptMap.get(bean.getDeptId())) {
                 result.append(BusinessExceptionEnum.DEPT_NOT_EXISTENCE.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的性别等信息是否正确
-            if(!(bean.getSex().equals("男")||bean.getSex().equals("女"))){
+            if (!(bean.getSex().equals("男") || bean.getSex().equals("女"))) {
                 result.append(BusinessExceptionEnum.SEX_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getMainExaminer().equals("是")||bean.getMainExaminer().equals("否"))){
+            if (!(bean.getMainExaminer().equals("是") || bean.getMainExaminer().equals("否"))) {
                 result.append(BusinessExceptionEnum.MAIN_EXAMINER_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getSpecialOperator().equals("是")||bean.getSpecialOperator().equals("否"))){
+            if (!(bean.getSpecialOperator().equals("是") || bean.getSpecialOperator().equals("否"))) {
                 result.append(BusinessExceptionEnum.SPECIAL_OPERATOR_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(!(bean.getTechnologyExam().equals("是")||bean.getTechnologyExam().equals("否"))){
+            if (!(bean.getTechnologyExam().equals("是") || bean.getTechnologyExam().equals("否"))) {
                 result.append(BusinessExceptionEnum.TECHNOLOGY_EXAM_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             // 校验导入数据中的日期格式是否规范
-            if(isDateFormat(bean.getValidDate())){
+            if (isDateFormat(bean.getValidDate())) {
                 result.append(BusinessExceptionEnum.VALID_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getWorkDate())){
+            if (isDateFormat(bean.getWorkDate())) {
                 result.append(BusinessExceptionEnum.WORK_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getBirthday())){
+            if (isDateFormat(bean.getBirthday())) {
                 result.append(BusinessExceptionEnum.BIRTHDAY_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
-            if(isDateFormat(bean.getCertificateDate())){
+            if (isDateFormat(bean.getCertificateDate())) {
                 result.append(BusinessExceptionEnum.CERTIFICATE_DATE_NOT_CORRECT.getMessage());
                 checkResult.set(false);
             }
             bean.setResult(result.toString());
         });
-        if(checkResult.get()){
+        if (checkResult.get()) {
             // 校验通过
             AtomicLong maxNo = new AtomicLong(meterStaffMapper.getMaxNo());
-            list.forEach(bean->{
+            list.forEach(bean -> {
                 // 生成编号
                 String staffNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.STAFF_PREFIX, maxNo.get());
                 maxNo.set(Long.parseLong(staffNo.substring(4)));
                 bean.setStaffNo(staffNo);
                 // 获取id
-                Long id= IdWorker.getId();
+                Long id = IdWorker.getId();
                 bean.setId(id);
-                Long certificateId= IdWorker.getId();
+                Long certificateId = IdWorker.getId();
                 bean.setCertificateId(certificateId);
                 // 将数据的字典值替换
                 bean.setEducation(educationDictMap.get(bean.getEducation()).get(0).getCode());
                 bean.setTechnologyJob(technologyJobDictMap.get(bean.getTechnologyJob()).get(0).getCode());
                 bean.setAdministrationJob(administrationJobDictMap.get(bean.getAdministrationJob()).get(0).getCode());
                 bean.setDeptId(deptMap.get(bean.getDeptId()).get(0).getId());
-                bean.setSex(bean.getSex().equals("男")?"1":"2");
-                bean.setMainExaminer(bean.getMainExaminer().equals("是")?"0":"1");
-                bean.setSpecialOperator(bean.getSpecialOperator().equals("是")?"0":"1");
-                bean.setTechnologyExam(bean.getTechnologyExam().equals("是")?"0":"1");
+                bean.setSex(bean.getSex().equals("男") ? "1" : "2");
+                bean.setMainExaminer(bean.getMainExaminer().equals("是") ? "0" : "1");
+                bean.setSpecialOperator(bean.getSpecialOperator().equals("是") ? "0" : "1");
+                bean.setTechnologyExam(bean.getTechnologyExam().equals("是") ? "0" : "1");
             });
             // 批量新增数据
             meterStaffMapper.addStaffList(list);
             meterCertificateMapper.addCertificateList(list);
             return ReturnUtil.success();
-        }else{
+        } else {
             // 校验不通过
             // 将处理后的数据导出成文件
             MultipartFile[] file = ExportUtils.exportMultipartFile(list, "checkResult", MeterStaffImport.class);
@@ -304,17 +307,17 @@
         try {
             DateUtil.parseDate(date);
             return false;
-        }catch (Exception e){
+        } catch (Exception e) {
             return true;
         }
     }
 
 
-    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList){
-        meterStaffList.forEach(bean->{
-            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION,bean.getEducation()));
-            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB,bean.getTechnologyJob()));
-            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB,bean.getAdministrationJob()));
+    private List<MeterStaff> supplementList(List<MeterStaff> meterStaffList) {
+        meterStaffList.forEach(bean -> {
+            bean.setEducation(dictService.getDictNameByCode(MeterDictEnum.EDUCATION, bean.getEducation()));
+            bean.setTechnologyJob(dictService.getDictNameByCode(MeterDictEnum.TECHNOLOGY_JOB, bean.getTechnologyJob()));
+            bean.setAdministrationJob(dictService.getDictNameByCode(MeterDictEnum.ADMINISTRATION_JOB, bean.getAdministrationJob()));
             bean.setDeptId(deptMapper.selectById(bean.getDeptId()).getFullName());
         });
         return meterStaffList;
@@ -334,11 +337,31 @@
     @Transactional
     public ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list) {
         QueryWrapper<MeterTrainStaff> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",list.get(0).getStaffId());
-        if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){
+        wrapper.eq("staff_id", list.get(0).getStaffId());
+        if (trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
+    @Override
+    public ReturnDTO<Map<String, Integer>> isMeterStaff() {
+        AuthUser authUser = ShiroKit.getUser();
+        MeterStaff meterStaff = getMeterStaffInfo(authUser);
+        HashMap<String, Integer> map = new HashMap<>();
+        if (Objects.isNull(meterStaff)) {
+            map.put("isMeterStaff", 0);
+        }else {
+            map.put("isMeterStaff", 1);
+        }
+        return ReturnUtil.success(map);
+    }
+
+    private MeterStaff getMeterStaffInfo(AuthUser user) {
+        String account = user.getAccount();
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("account", account);
+        return meterStaffMapper.selectOne(wrapper);
+    }
+
 }
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
index 8d07e18..f422426 100644
--- 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
@@ -1,10 +1,25 @@
 package com.casic.missiles.service.Impl.workbench;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.dto.flowable.ToBeApprovedDTO;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
+import com.casic.missiles.enums.system.ApplyFromIdEnum;
 import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper;
 import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
+import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.workbench.IWorkbenchApprovalMessageService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -16,5 +31,59 @@
  */
 @Service
 public class WorkbenchApprovalMessageServiceImpl extends ServiceImpl<WorkbenchApprovalMessageMapper, WorkbenchApprovalMessage> implements IWorkbenchApprovalMessageService {
+    @Autowired
+    private IBaseApprovalService baseApprovalService;
 
+    @Autowired
+    private WorkbenchApprovalMessageMapper approvalMessageMapper;
+
+    @Override
+    public List<WorkbenchApprovalMessage> listPage(Page<WorkbenchApprovalMessage> page, ApprovalMessageRequest approvalMessageRequest) {
+        //所有业务待审批列表封装为消息
+        //计量管理：计量文件、培训计划、溯源供方
+        //测量设备：标准装置：更换、暂停、撤销、恢复、复查；
+        //         状态管理：闲置、封存、启封、报废、处置，维护：检修、保养，领用，借用这些都在状态管理里，对应枚举：EquipmentApplyTypeEnum
+        //业务管理：分包方资格、项目申请、项目验收，现场检测
+        // TODO: 2023/4/21 多线程优化查询，分页
+        List<WorkbenchApprovalMessage> resultList = new ArrayList<>();
+        if(Objects.nonNull(approvalMessageRequest.getStatus()) && 1 == approvalMessageRequest.getStatus()){
+            for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) {
+                if(StringUtils.isNotEmpty(approvalMessageRequest.getMessageSourceModule()) &&
+                        applyFromIdEnum.getSource().equals(approvalMessageRequest.getMessageSourceModule())){
+                    continue;
+                }
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(applyFromIdEnum.getCode());
+                if(CollectionUtils.isEmpty(toBeApprovedList)){
+                    continue;
+                }
+                toBeApprovedList.forEach(a -> {
+                    WorkbenchApprovalMessage message = new WorkbenchApprovalMessage();
+                    message.setCreateTime(a.getCreateTime());
+                    message.setFormId(applyFromIdEnum.getCode());
+                    message.setMessageSourceModule(applyFromIdEnum.getSource());
+                    message.setMessageTitle("待审批通知");
+                    message.setMessageContent(applyFromIdEnum.getValue());
+                    message.setStatus(0);//待审批消息都是未读/未处理，处理后就不会在这个列表显示
+                    resultList.add(message);
+                });
+            }
+        }
+        //通知消息
+        QueryWrapper<WorkbenchApprovalMessage> wrapper = new QueryWrapper<>();
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getNoticeId()), "notice_id", approvalMessageRequest.getNoticeId());
+        wrapper.eq(StringUtils.isNotBlank(approvalMessageRequest.getMessageSourceModule()), "message_source_module", approvalMessageRequest.getMessageSourceModule());
+        wrapper.eq(Objects.nonNull(approvalMessageRequest.getStatus()), "status", approvalMessageRequest.getStatus());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getStartTime()),
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(approvalMessageRequest.getEndTime()),
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%s')", approvalMessageRequest.getEndTime());
+        List<WorkbenchApprovalMessage> list = approvalMessageMapper.selectList(wrapper);
+        if(!CollectionUtils.isEmpty(list)){
+            resultList.addAll(list);
+        }
+        //按时间排序组装
+        List<WorkbenchApprovalMessage> finalList = resultList.stream().sorted(Comparator.comparing(WorkbenchApprovalMessage::getCreateTime).reversed()).collect(Collectors.toList());
+
+        return finalList;
+    }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
index cf83a54..c131ba2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java
@@ -12,6 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -43,4 +44,6 @@
     Page<MeterTrainStaff> staffCultivateLog(Page<MeterTrainStaff> page, IdDTO idDto);
 
     ReturnDTO updateStaffCultivateLog(List<MeterTrainStaff> list);
+
+    ReturnDTO<Map<String, Integer>> isMeterStaff();
 }
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
index 611cad0..aef9611 100644
--- 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
@@ -1,8 +1,12 @@
 package com.casic.missiles.service.workbench;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.casic.missiles.dto.workbench.ApprovalMessageRequest;
 import com.casic.missiles.model.workbench.WorkbenchApprovalMessage;
 
+import java.util.List;
+
 /**
  * <p>
  * 审批通过通知消息 服务类
@@ -13,4 +17,5 @@
  */
 public interface IWorkbenchApprovalMessageService extends IService<WorkbenchApprovalMessage> {
 
+    List<WorkbenchApprovalMessage> listPage(Page<WorkbenchApprovalMessage> page, ApprovalMessageRequest approvalMessageRequest);
 }